From a7ab8c6a4bfe6a4c566f17456f0c559f48140bef Mon Sep 17 00:00:00 2001 From: Fabian Homborg Date: Fri, 15 Mar 2019 19:55:35 +0100 Subject: [PATCH] Remove __fish_test_arg helper function This was a remnant from before `string` existed, and was only used by the xterm completions. Part of #5279 [ci skip] --- share/completions/xterm.fish | 92 ++++++++++++++-------------- share/functions/__fish_test_arg.fish | 9 --- 2 files changed, 46 insertions(+), 55 deletions(-) delete mode 100644 share/functions/__fish_test_arg.fish diff --git a/share/completions/xterm.fish b/share/completions/xterm.fish index 4546f3730..036d0643e 100644 --- a/share/completions/xterm.fish +++ b/share/completions/xterm.fish @@ -1,52 +1,52 @@ # completion for xterm -complete -c xterm -n '__fish_test_arg "+*"' -a +ah -d 'Never highlight the text cursor' -complete -c xterm -n '__fish_test_arg "+*"' -a +ai -d 'Enable active icon support' -complete -c xterm -n '__fish_test_arg "+*"' -a +aw -d 'Disallow auto wraparound' -complete -c xterm -n '__fish_test_arg "+*"' -a +bc -d 'Turn off cursor blinking' -complete -c xterm -n '__fish_test_arg "+*"' -a +bdc -d 'Enable the display of bold characters' -complete -c xterm -n '__fish_test_arg "+*"' -a +cb -d 'Set the vt100 resource cutToBeginningOfLine to \'true\'' -complete -c xterm -n '__fish_test_arg "+*"' -a +cjk_width -d 'Set the cjkWidth resource to \'false\'' -complete -c xterm -n '__fish_test_arg "+*"' -a +cm -d 'Enable recognition of ANSI color-change escape sequences' -complete -c xterm -n '__fish_test_arg "+*"' -a +cn -d 'Cut newlines in line-mode selections' -complete -c xterm -n '__fish_test_arg "+*"' -a +cu -d 'Don\'t workaround the bug in more(1)' -complete -c xterm -n '__fish_test_arg "+*"' -a +dc -d 'Disable dynamic color changing' -complete -c xterm -n '__fish_test_arg "+*"' -a +fbb -d 'Don\'t ensure compatibility between normal and bold fonts bounding boxes' -complete -c xterm -n '__fish_test_arg "+*"' -a +fbx -d 'Normal and bold fonts have VT100 line-drawing characters' -complete -c xterm -n '__fish_test_arg "+*"' -a +hf -d 'Don\'t generate HP Function Key escape codes for function keys' -complete -c xterm -n '__fish_test_arg "+*"' -a +hold -d 'Close xterm\'s window after the shell exits' -complete -c xterm -n '__fish_test_arg "+*"' -a +ie -d 'Don\'t use pseudo-terminal\'s sense of the stty erase value' -complete -c xterm -n '__fish_test_arg "+*"' -a +im -d 'Don\'t force insert mode' -complete -c xterm -n '__fish_test_arg "+*"' -a +j -d 'Don\'t use jump scrolling' -complete -c xterm -n '__fish_test_arg "+*"' -a +k8 -d 'Don\'t treat C1 control characters as printable' -complete -c xterm -n '__fish_test_arg "+*"' -a +l -d 'Turn off logging' -complete -c xterm -n '__fish_test_arg "+*"' -a +lc -d 'Turn off support for encodings according the locale setting' -complete -c xterm -n '__fish_test_arg "+*"' -a +ls -d 'The shell in xterm\'s window will not be login shell' -complete -c xterm -n '__fish_test_arg "+*"' -a +mb -d 'Don\'t ring bell if the user types near the end of line' -complete -c xterm -n '__fish_test_arg "+*"' -a +mesg -d 'Allow write access to the terminal' -complete -c xterm -n '__fish_test_arg "+*"' -a +mk_width -d 'Don\'t use builtin version for the wide-character calculation' -complete -c xterm -n '__fish_test_arg "+*"' -a +nul -d 'Enable underlining' -complete -c xterm -n '__fish_test_arg "+*"' -a +pc -d 'Disable PC style bold colors' -complete -c xterm -n '__fish_test_arg "+*"' -a +pob -d 'Don\'t raise window on Control-G' -complete -c xterm -n '__fish_test_arg "+*"' -a +rvc -d 'Enable characters with reverse attribute as color' -complete -c xterm -n '__fish_test_arg "+*"' -a +rw -d 'Disable reverse-wraparound' -complete -c xterm -n '__fish_test_arg "+*"' -a +s -d 'Turn off asynchronous scrolling' -complete -c xterm -n '__fish_test_arg "+*"' -a +samename -d 'Send title/icon change requests always' -complete -c xterm -n '__fish_test_arg "+*"' -a +sb -d 'Don\'t display scrollbar' -complete -c xterm -n '__fish_test_arg "+*"' -a +sf -d 'Don\'t generate Sun Function Key escape codes for function keys' -complete -c xterm -n '__fish_test_arg "+*"' -a +si -d 'Move the screen to the bottom on input' -complete -c xterm -n '__fish_test_arg "+*"' -a +sk -d 'Don\'t move the screen to the bottom on key press while scrolling' -complete -c xterm -n '__fish_test_arg "+*"' -a +sm -d 'Don\'t setup session manager callbacks' -complete -c xterm -n '__fish_test_arg "+*"' -a +sp -d 'Don\'t assume Sun/PC keyboard' -complete -c xterm -n '__fish_test_arg "+*"' -a +t -d 'VT102 mode' -complete -c xterm -n '__fish_test_arg "+*"' -a +tb -d 'Don\'t display toolbar or menubar' -complete -c xterm -n '__fish_test_arg "+*"' -a +u8 -d 'Don\'t use UTF-8' -complete -c xterm -n '__fish_test_arg "+*"' -a +ulc -d 'Display characters with underline attribute as color' -complete -c xterm -n '__fish_test_arg "+*"' -a +ut -d 'Write to the system utmp log file' -complete -c xterm -n '__fish_test_arg "+*"' -a +vb -d 'Don\'t use visual bell insead of audio bell' -complete -c xterm -n '__fish_test_arg "+*"' -a +wc -d 'Don\'t use wide characters' -complete -c xterm -n '__fish_test_arg "+*"' -a +wf -d 'Don\'t wait the first time for the window to be mapped' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ah -d 'Never highlight the text cursor' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ai -d 'Enable active icon support' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +aw -d 'Disallow auto wraparound' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +bc -d 'Turn off cursor blinking' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +bdc -d 'Enable the display of bold characters' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cb -d 'Set the vt100 resource cutToBeginningOfLine to \'true\'' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cjk_width -d 'Set the cjkWidth resource to \'false\'' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cm -d 'Enable recognition of ANSI color-change escape sequences' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cn -d 'Cut newlines in line-mode selections' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +cu -d 'Don\'t workaround the bug in more(1)' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +dc -d 'Disable dynamic color changing' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +fbb -d 'Don\'t ensure compatibility between normal and bold fonts bounding boxes' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +fbx -d 'Normal and bold fonts have VT100 line-drawing characters' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +hf -d 'Don\'t generate HP Function Key escape codes for function keys' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +hold -d 'Close xterm\'s window after the shell exits' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ie -d 'Don\'t use pseudo-terminal\'s sense of the stty erase value' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +im -d 'Don\'t force insert mode' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +j -d 'Don\'t use jump scrolling' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +k8 -d 'Don\'t treat C1 control characters as printable' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +l -d 'Turn off logging' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +lc -d 'Turn off support for encodings according the locale setting' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ls -d 'The shell in xterm\'s window will not be login shell' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +mb -d 'Don\'t ring bell if the user types near the end of line' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +mesg -d 'Allow write access to the terminal' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +mk_width -d 'Don\'t use builtin version for the wide-character calculation' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +nul -d 'Enable underlining' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +pc -d 'Disable PC style bold colors' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +pob -d 'Don\'t raise window on Control-G' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +rvc -d 'Enable characters with reverse attribute as color' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +rw -d 'Disable reverse-wraparound' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +s -d 'Turn off asynchronous scrolling' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +samename -d 'Send title/icon change requests always' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sb -d 'Don\'t display scrollbar' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sf -d 'Don\'t generate Sun Function Key escape codes for function keys' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +si -d 'Move the screen to the bottom on input' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sk -d 'Don\'t move the screen to the bottom on key press while scrolling' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sm -d 'Don\'t setup session manager callbacks' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +sp -d 'Don\'t assume Sun/PC keyboard' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +t -d 'VT102 mode' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +tb -d 'Don\'t display toolbar or menubar' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +u8 -d 'Don\'t use UTF-8' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ulc -d 'Display characters with underline attribute as color' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +ut -d 'Write to the system utmp log file' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +vb -d 'Don\'t use visual bell insead of audio bell' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +wc -d 'Don\'t use wide characters' +complete -c xterm -n 'string match "+*" -- (commandline -ct)' -a +wf -d 'Don\'t wait the first time for the window to be mapped' complete -c xterm -o version -d 'Print version number to the standard output' complete -c xterm -o help -d 'Print out a verbose message describing the options' diff --git a/share/functions/__fish_test_arg.fish b/share/functions/__fish_test_arg.fish deleted file mode 100644 index 695c96866..000000000 --- a/share/functions/__fish_test_arg.fish +++ /dev/null @@ -1,9 +0,0 @@ - -function __fish_test_arg --description "Test if the token under the cursor matches the specified wildcard" - switch (commandline -ct) - case $argv - return 0 - end - return 1 -end -