From c0cf25cf0b28969dd9ef821f7952f42783ed6720 Mon Sep 17 00:00:00 2001
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
Date: Fri, 22 May 2015 09:48:39 +0800
Subject: [PATCH] abbr: rename --remove to --erase

for consistency with other fish commands

Closes #2071.
---
 doc_src/abbr.txt                    | 8 ++++----
 share/completions/abbr.fish         | 2 +-
 share/functions/abbr.fish           | 6 +++---
 share/tools/web_config/webconfig.py | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc_src/abbr.txt b/doc_src/abbr.txt
index 0c3dc37a3..a32592d88 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 6671ecd68..3dcac341a 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 7669b8fd1..dd67b898f 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/tools/web_config/webconfig.py b/share/tools/web_config/webconfig.py
index 5438a43e8..d65c86f89 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: