Merge branch 'Eugeny:master' into ssh-default-profile

Eugeny · Dec 17, 2024 · 6a672a5 · 6a672a5
2 parents 1f2caa8 + 6196f3b
commit 6a672a5
Show file tree

Hide file tree

Showing 10 changed files with 520 additions and 920 deletions.
diff --git a/extras/clink/CHANGES b/extras/clink/CHANGES
diff --git a/extras/clink/clink.bat b/extras/clink/clink.bat
@@ -1,63 +1,64 @@
-:: Copyright (c) 2012 Martin Ridgers
-:: License: http://opensource.org/licenses/MIT
-
 @echo off
+rem -- Copyright (c) 2012 Martin Ridgers
+rem -- Portions Copyright (c) 2020-2024 Christopher Antos
+rem -- License: http://opensource.org/licenses/MIT
+
 setlocal enableextensions
 set clink_profile_arg=
 set clink_quiet_arg=
 
-:: Mimic cmd.exe's behaviour when starting from the start menu.
-if /i "%1"=="startmenu" (
+rem -- Mimic cmd.exe's behaviour when starting from the start menu.
+if /i "%~1"=="startmenu" (
     cd /d "%userprofile%"
     shift
 )
 
-:: Check for the --profile option.
-if /i "%1"=="--profile" (
+rem -- Check for the --profile option.
+if /i "%~1"=="--profile" (
     set clink_profile_arg=--profile "%~2"
     shift
     shift
 )
 
-:: Check for the --quiet option.
-if /i "%1"=="--quiet" (
+rem -- Check for the --quiet option.
+if /i "%~1"=="--quiet" (
     set clink_quiet_arg= --quiet
     shift
 )
 
-:: If the .bat is run without any arguments, then start a cmd.exe instance.
-if "%1"=="" (
+rem -- If the .bat is run without any arguments, then start a cmd.exe instance.
+if _%1==_ (
     call :launch
     goto :end
 )
 
-:: Test for autorun.
-if defined CLINK_NOAUTORUN if /i "%1"=="inject" if /i "%2"=="--autorun" goto :end
-
-:: Endlocal before inject tags the prompt.
-endlocal
+rem -- Test for autorun.
+if defined CLINK_NOAUTORUN if /i "%~1"=="inject" if /i "%~2"=="--autorun" goto :end
 
-:: Pass through to appropriate loader.
+rem -- Forward to appropriate loader, and endlocal before inject tags the prompt.
 if /i "%processor_architecture%"=="x86" (
+        endlocal
         "%~dp0\clink_x86.exe" %*
 ) else if /i "%processor_architecture%"=="arm64" (
+        endlocal
         "%~dp0\clink_arm64.exe" %*
 ) else if /i "%processor_architecture%"=="amd64" (
     if defined processor_architew6432 (
+        endlocal
         "%~dp0\clink_x86.exe" %*
     ) else (
+        endlocal
         "%~dp0\clink_x64.exe" %*
     )
 )
 
-:end
-goto :eof
+goto :end
 
-::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 :launch
-setlocal
+setlocal enableextensions
 set WT_PROFILE_ID=
 set WT_SESSION=
 start "Clink" cmd.exe /s /k ""%~dpnx0" inject %clink_profile_arg%%clink_quiet_arg%"
 endlocal
-exit /b 0
+
+:end
diff --git a/extras/clink/clink_arm64.exe b/extras/clink/clink_arm64.exe
diff --git a/extras/clink/clink_dll_arm64.dll b/extras/clink/clink_dll_arm64.dll
diff --git a/extras/clink/clink_dll_x64.dll b/extras/clink/clink_dll_x64.dll
diff --git a/extras/clink/clink_dll_x86.dll b/extras/clink/clink_dll_x86.dll
diff --git a/extras/clink/clink_x64.exe b/extras/clink/clink_x64.exe
diff --git a/extras/clink/clink_x86.exe b/extras/clink/clink_x86.exe
diff --git a/extras/clink/default_inputrc b/extras/clink/default_inputrc
@@ -4,10 +4,10 @@
 # Override the built-in Readline defaults with ones that provide a more
 # enhanced Clink experience.
 
-colored-completion-prefix                   on
-colored-stats                               on
-mark-symlinked-directories                  on
-completion-auto-query-items                 on
-history-point-at-end-of-anchored-search     on
-search-ignore-case                          on
+set colored-completion-prefix                   on
+set colored-stats                               on
+set mark-symlinked-directories                  on
+set completion-auto-query-items                 on
+set history-point-at-end-of-anchored-search     on
+set search-ignore-case                          on
 
diff --git a/extras/clink/default_settings b/extras/clink/default_settings
@@ -4,28 +4,26 @@
 # Override built-in default settings with ones that provide a more
 # enhanced Clink experience.
 
-autosuggest.enable                = True
 clink.default_bindings            = windows
 cmd.ctrld_exits                   = False
 color.arginfo                     = sgr 38;5;172
 color.argmatcher                  = sgr 1;38;5;40
-color.cmd                         = sgr 1;38;5;231
+color.cmd                         = bold
 color.cmdredir                    = sgr 38;5;172
-color.cmdsep                      = sgr 38;5;214
+color.cmdsep                      = sgr 38;5;135
 color.comment_row                 = sgr 38;5;87;48;5;18
 color.description                 = sgr 38;5;39
 color.doskey                      = sgr 1;38;5;75
 color.executable                  = sgr 1;38;5;33
-color.filtered                    = sgr 38;5;231
+color.filtered                    = bold
 color.flag                        = sgr 38;5;117
 color.hidden                      = sgr 38;5;160
 color.histexpand                  = sgr 97;48;5;55
 color.horizscroll                 = sgr 38;5;16;48;5;30
-color.input                       = sgr 38;5;222
+color.input                       = sgr 38;5;214
 color.readonly                    = sgr 38;5;28
-color.selected_completion         = sgr 38;5;16;48;5;254
+color.selected_completion         = sgr 7
 color.selection                   = sgr 38;5;16;48;5;179
-color.suggestion                  = sgr 38;5;239
 color.unrecognized                = sgr 38;5;203
 history.max_lines                 = 25000
 history.time_stamp                = show