From c6166f8cedf768e5ca2373ed13ab64c6681a34b2 Mon Sep 17 00:00:00 2001 From: Aaron Gyes Date: Thu, 27 Jan 2022 16:21:22 -0800 Subject: [PATCH] Shorten more. More vain attempts to get a bare showing as 2 columns in the pager. This now happens in a 101 column terminal. --- share/config.fish | 2 +- share/functions/down-or-search.fish | 2 +- share/functions/fish_default_key_bindings.fish | 2 +- share/functions/fish_default_mode_prompt.fish | 2 +- share/functions/fish_status_to_signal.fish | 2 +- share/functions/fish_vcs_prompt.fish | 2 +- share/functions/up-or-search.fish | 2 +- src/builtin.cpp | 10 +++++----- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/share/config.fish b/share/config.fish index 6caec2003..622988f74 100644 --- a/share/config.fish +++ b/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 diff --git a/share/functions/down-or-search.fish b/share/functions/down-or-search.fish index 95cebf17f..bc4553141 100644 --- a/share/functions/down-or-search.fish +++ b/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 diff --git a/share/functions/fish_default_key_bindings.fish b/share/functions/fish_default_key_bindings.fish index bca00fc7c..44311ad87 100644 --- a/share/functions/fish_default_key_bindings.fish +++ b/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" diff --git a/share/functions/fish_default_mode_prompt.fish b/share/functions/fish_default_mode_prompt.fish index 21e4af86f..f8ae0ccaa 100644 --- a/share/functions/fish_default_mode_prompt.fish +++ b/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 diff --git a/share/functions/fish_status_to_signal.fish b/share/functions/fish_status_to_signal.fish index 609ac3ff4..057345aac 100644 --- a/share/functions/fish_status_to_signal.fish +++ b/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 diff --git a/share/functions/fish_vcs_prompt.fish b/share/functions/fish_vcs_prompt.fish index ed2d90725..4b1723d36 100644 --- a/share/functions/fish_vcs_prompt.fish +++ b/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 diff --git a/share/functions/up-or-search.fish b/share/functions/up-or-search.fish index 22583b0f4..1a1bfdab0 100644 --- a/share/functions/up-or-search.fish +++ b/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 diff --git a/src/builtin.cpp b/src/builtin.cpp index 070df517c..683f49079 100644 --- a/src/builtin.cpp +++ b/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"case", &builtin_generic, N_(L"Conditionally execute a block of commands")}, + {L"builtin", &builtin_builtin, N_(L"Run a builtin specifically")}, + {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")},