From cf2f3b8564ce6f8295fc7396131e4fb171fbe2cf Mon Sep 17 00:00:00 2001
From: Henry Bley-Vroman <olets@olets.dev>
Date: Mon, 17 Feb 2020 14:28:07 -0500
Subject: [PATCH] feat(scope): shorthand for --session is now -S

---
 README.md    | 19 +++++++++----------
 zsh-abbr.zsh | 16 ++++++++--------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 0c8d6acb..85ba7a7d 100644
--- a/README.md
+++ b/README.md
@@ -92,7 +92,7 @@ Clone this repo and add `source path/to/zsh-abbr.zsh` to your `.zshrc`.
 
 # The above will in other open sessions, and in future sessions.
 # Add an abbreviation only available in the current terminal
-% abbr -g gco[Ctrl-Space] https://en.wikipedia.org/wiki/GCO
+% abbr -S gco[Ctrl-Space] https://en.wikipedia.org/wiki/GCO
 # (Note that Ctrl-Space opts out of space-triggered expansion)
 % gco[Space] # expands to `https://en.wikipedia.org/wiki/GCO`
 
@@ -102,7 +102,7 @@ Clone this repo and add `source path/to/zsh-abbr.zsh` to your `.zshrc`.
 % wgco[Space] # expands to `https://en.wikipedia.org/wiki/GCO`
 
 # Delete it
-% abbr -g wgco[Ctrl-Space]
+% abbr -S wgco[Ctrl-Space]
 % wgco[Space] # no expansion
 
 # Migrate your aliases to abbreviations
@@ -125,7 +125,7 @@ abbr <OPTION> <SCOPE> <ANY OPTION ARGUMENTS>
 ### Scope
 
 ```shell
-[(--session | -g) | (--user | -U)]
+[(--session | -S) | (--user | -U)]
 ```
 
 A given abbreviation can be made available in the current zsh session (i.e. in the current terminal) —these are called *session* abbreviations— or to all terminals —these are called *user* abbreviations.
@@ -142,7 +142,6 @@ abbr [(--add | -a)
       | (--erase | -e)
       | (--expand | -x)
       | (--git-populate | -i)
-      | (--session | -g)
       | (--help | -h)
       | (--list | -l)
       | (--output-aliases | -o)
@@ -273,7 +272,7 @@ List all abbreviations available in the current shell. User abbreviations appear
 ```shell
 % abbr a apple
 % abbr b ball
-% abbr -g c cat
+% abbr -S c cat
 % abbr -l
 a
 b
@@ -298,17 +297,17 @@ Export abbreviations as aliases declarations. To export session abbreviations, u
 ```
 ```shell
 % abbr --output-aliases
-alias -g gcm='git checkout master'
+alias -S gcm='git checkout master'
 ```
 ```shell
 % abbr --output-aliases --session
-alias -g g='git'
+alias -S g='git'
 ```
 ```shell
 % abbr --output-aliases ~/.zshrc
 % cat ~/.zshrc
 # -- snip --
-alias -g g='git'
+alias -S g='git'
 ```
 
 #### Populate
@@ -326,7 +325,7 @@ See also **Git Populate**.
 ```shell
 % cat ~/.zshrc
 # --snip--
-alias -g d='bin/deploy'
+alias -S d='bin/deploy'
 # --snip--
 % abbr --populate --session
 % d[Space] # expands to bin/deploy
@@ -369,7 +368,7 @@ Show all the abbreviations available in the current session, along with their ex
 % abbr --add --session a apple
 % abbr --show # or `abbr` with no arguments
 abbr -a -U -- gcm git checkout master
-abbr -a -g -- a apple
+abbr -a -S -- a apple
 % source ~/.zshrc
 % abbr --show
 abbr -a -U -- gcm git checkout master
diff --git a/zsh-abbr.zsh b/zsh-abbr.zsh
index 6b294153..aede8015 100755
--- a/zsh-abbr.zsh
+++ b/zsh-abbr.zsh
@@ -115,7 +115,7 @@ _zsh_abbr() {
        In addition, when adding abbreviations, erasing, outputting aliases,
        [git] populating, or renaming use
 
-       o --session or -g to create a session abbreviation, available only in the
+       o --session or -S to create a session abbreviation, available only in the
          current session.
 
        o --user or -U to create a user abbreviation (default),
@@ -542,13 +542,6 @@ _zsh_abbr() {
           opt_expand=true
           ((number_opts++))
           ;;
-        "--session"|\
-        "-g")
-          [ "$scope_set" = true ] && util_bad_options
-          scope_set=true
-          opt_session=true
-          ((number_opts++))
-          ;;
         "--help"|\
         "-h")
           util_usage
@@ -589,6 +582,13 @@ _zsh_abbr() {
           opt_rename=true
           ((number_opts++))
           ;;
+        "--session"|\
+        "-S")
+          [ "$scope_set" = true ] && util_bad_options
+          scope_set=true
+          opt_session=true
+          ((number_opts++))
+          ;;
         "--show"|\
         "-s")
           [ "$action_set" = true ] && util_bad_options