Shorten more.

More vain attempts to get a bare <TAB> showing as 2 columns in the
pager. This now happens in a 101 column terminal.

share/config.fish

@@ -140,7 +140,7 @@ end
 #
 # Launch debugger on SIGTRAP
 #
-function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP signal handler: debug prompt"
+function fish_sigtrap_handler --on-signal TRAP --no-scope-shadowing --description "TRAP handler: debug prompt"
     breakpoint
 end
 

share/functions/down-or-search.fish

@@ -1,4 +1,4 @@
-function down-or-search -d "search forward or move down one line"
+function down-or-search -d "search forward or move down 1 line"
     # If we are already in search mode, continue
     if commandline --search-mode
         commandline -f history-search-forward

share/functions/fish_default_key_bindings.fish

@@ -1,4 +1,4 @@
-function fish_default_key_bindings -d "Default (emacs-like) key bindings"
+function fish_default_key_bindings -d "emacs-like key binds"
     if contains -- -h $argv
         or contains -- --help $argv
         echo "Sorry but this function doesn't support -h or --help"

share/functions/fish_default_mode_prompt.fish

@@ -1,4 +1,4 @@
-function fish_default_mode_prompt --description "Display default prompt mode"
+function fish_default_mode_prompt --description "Display vi prompt mode"
     # Do nothing if not in vi mode
     if test "$fish_key_bindings" = fish_vi_key_bindings
         or test "$fish_key_bindings" = fish_hybrid_key_bindings

share/functions/fish_status_to_signal.fish

@@ -1,4 +1,4 @@
-function fish_status_to_signal --description "Print signal name from argument (\$status), or just argument"
+function fish_status_to_signal --description "Convert exit code to signal name"
     __fish_make_completion_signals # Make sure signals are cached
     for arg in $argv
         if test $arg -gt 128

share/functions/fish_vcs_prompt.fish

@@ -1,4 +1,4 @@
-function fish_vcs_prompt --description "Print the prompts for all available vcsen"
+function fish_vcs_prompt --description "Print all vcs prompts"
     # If a prompt succeeded, we assume that it's printed the correct info.
     # This is so we don't try svn if git already worked.
     fish_git_prompt $argv

share/functions/up-or-search.fish

@@ -1,5 +1,5 @@
 # Depending on cursor position and current mode, either search backward or move up one line"
-function up-or-search -d "Search backward or move cursor up 1 line"
+function up-or-search -d "Search back or move cursor up 1 line"
     # If we are already in search mode, continue
     if commandline --search-mode
         commandline -f history-search-backward

src/builtin.cpp

@@ -358,7 +358,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L":", &builtin_true, N_(L"Return a successful result")},
     {L"[", &builtin_test, N_(L"Test a condition")},
     {L"_", &builtin_gettext, N_(L"Translate a string")},
-    {L"and", &builtin_generic, N_(L"Execute command if previous command succeeded")},
+    {L"and", &builtin_generic, N_(L"Run command if last command succeeded")},
     {L"argparse", &builtin_argparse, N_(L"Parse options in fish script")},
     {L"begin", &builtin_generic, N_(L"Create a block of code")},
     {L"bg", &builtin_bg, N_(L"Send job to background")},
@@ -366,10 +366,10 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"block", &builtin_block, N_(L"Temporarily block delivery of events")},
     {L"break", &builtin_break_continue, N_(L"Stop the innermost loop")},
     {L"breakpoint", &builtin_breakpoint, N_(L"Halt execution and start debug prompt")},
-    {L"builtin", &builtin_builtin, N_(L"Run a builtin command instead of a function")},
+    {L"builtin", &builtin_builtin, N_(L"Run a builtin specifically")},
-    {L"case", &builtin_generic, N_(L"Conditionally execute a block of commands")},
+    {L"case", &builtin_generic, N_(L"Block of code to run conditionally")},
     {L"cd", &builtin_cd, N_(L"Change working directory")},
-    {L"command", &builtin_command, N_(L"Run program instead of a function or builtin")},
+    {L"command", &builtin_command, N_(L"Run a command specifically")},
     {L"commandline", &builtin_commandline, N_(L"Set or get the commandline")},
     {L"complete", &builtin_complete, N_(L"Edit command specific completions")},
     {L"contains", &builtin_contains, N_(L"Search for a specified string in a list")},
@@ -405,7 +405,7 @@ static constexpr builtin_data_t builtin_datas[] = {
     {L"source", &builtin_source, N_(L"Evaluate contents of file")},
     {L"status", &builtin_status, N_(L"Return status information about fish")},
     {L"string", &builtin_string, N_(L"Manipulate strings")},
-    {L"switch", &builtin_generic, N_(L"Conditionally execute a block of commands")},
+    {L"switch", &builtin_generic, N_(L"Conditionally run blocks of code")},
     {L"test", &builtin_test, N_(L"Test a condition")},
     {L"time", &builtin_generic, N_(L"Measure how long a command or block takes")},
     {L"true", &builtin_true, N_(L"Return a successful result")},