diff options
| author |  David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-06-05 14:02:25 +0800 |
|---|---|---|
| committer | David Adam <zanchey@ucc.gu.uwa.edu.au> | 2015-06-05 14:02:25 +0800 |
| commit | 18d74655925eb7afb133b1b1437b901ae816e33e (patch) | |
| tree | 4552d94195fb11573cf0270f8be75b856e5f9669 | |
| parent | ec7dd1ece8d4ad89f9d6027fd8d7d65552eb3a04 (diff) | |
| parent | b6b6de330463db1b79c9c7a67efd6d671b9b9de3 (diff) | |
Merge branch 'Integration_2.2.0'
| -rw-r--r-- | doc_src/abbr.txt | 8 | ||||
| -rw-r--r-- | share/completions/abbr.fish | 2 | ||||
| -rw-r--r-- | share/functions/abbr.fish | 6 | ||||
| -rw-r--r-- | share/functions/fish_vi_key_bindings.fish | 2 | ||||
| -rwxr-xr-x | share/tools/web_config/webconfig.py | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/doc_src/abbr.txt b/doc_src/abbr.txt index 0c3dc37a..a32592d8 100644 --- a/doc_src/abbr.txt +++ b/doc_src/abbr.txt @@ -5,7 +5,7 @@ abbr -a word="phrase" abbr -s abbr -l -abbr -r word +abbr -e word \endfish \subsection abbr-description Description @@ -24,7 +24,7 @@ The following parameters are available: - `-l` or `--list` Lists all abbreviated words. -- `-r WORD` or `--remove WORD` Remove the abbreviation WORD. +- `-e WORD` or `--erase WORD` Erase the abbreviation WORD. \subsection abbr-example Examples @@ -34,9 +34,9 @@ abbr -a gco git checkout Add a new abbreviation where `gco` will be replaced with `git checkout`. \fish -abbr -r gco +abbr -e gco \endfish -Remove the `gco` abbreviation. +Erase the `gco` abbreviation. \fish ssh another_host abbr -s | source diff --git a/share/completions/abbr.fish b/share/completions/abbr.fish index 6671ecd6..3dcac341 100644 --- a/share/completions/abbr.fish +++ b/share/completions/abbr.fish @@ -1,5 +1,5 @@ complete -c abbr -f -s a -l add -d 'Add abbreviation' -complete -c abbr -s r -l remove -d 'Remove abbreviation' -xa '(abbr -l)' +complete -c abbr -s e -l erase -d 'Erase abbreviation' -xa '(abbr -l)' complete -c abbr -f -s s -l show -d 'Print all abbreviations' complete -c abbr -f -s l -l list -d 'Print all abbreviation names' complete -c abbr -f -s h -l help -d 'Help' diff --git a/share/functions/abbr.fish b/share/functions/abbr.fish index 7669b8fd..dd67b898 100644 --- a/share/functions/abbr.fish +++ b/share/functions/abbr.fish @@ -26,8 +26,8 @@ function abbr --description "Manage abbreviations" case '-a' '--add' set new_mode add set needs_arg coalesce - case '-r' '--remove' - set new_mode remove + case '-e' '--erase' + set new_mode erase set needs_arg single case '-l' '--list' set new_mode list @@ -91,7 +91,7 @@ function abbr --description "Manage abbreviations" set fish_user_abbreviations $fish_user_abbreviations $mode_arg return 0 - case 'remove' + case 'erase' set -l key __fish_abbr_parse_entry $mode_arg key if set -l idx (__fish_abbr_get_by_key $key) diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish index 69049e70..aa6dda6f 100644 --- a/share/functions/fish_vi_key_bindings.fish +++ b/share/functions/fish_vi_key_bindings.fish @@ -191,7 +191,7 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish' bind -M insert \cb backward-word bind -M insert \cf forward-word - bind -M insert -m default \cc backward-char force-repaint + bind -M insert \cc 'commandline ""' bind -M insert -m default \e backward-char force-repaint bind -M insert \cd exit diff --git a/share/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py index 5438a43e..d65c86f8 100755 --- a/share/tools/web_config/webconfig.py +++ b/share/tools/web_config/webconfig.py @@ -702,7 +702,7 @@ class FishConfigHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): return result def do_remove_abbreviation(self, abbreviation): - out, err = run_fish_cmd('abbr -r %s' % abbreviation['word']) + out, err = run_fish_cmd('abbr -e %s' % abbreviation['word']) if out or err: return err else: |