zshrc: Use single quotes througout values in power abbreviations

[grml-etc-core.git] / etc / zsh / zshrc

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 2f2a85f..5b09f25 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -443,6 +443,13 @@ xunfunction() {
     return 0
 }
 
+# this allows us to stay in sync with grml's zshrc and put own
+# modifications in ~/.zshrc.local
+zrclocal() {
+    xsource "${HOME}/.zshrc.local"
+    return 0
+}
+
 #}}}
 
 # locale setup {{{
@@ -776,26 +783,26 @@ declare -A abk
 setopt extendedglob
 setopt interactivecomments
 abk=(
-# key  # value                (#d additional doc string)
+#   key   # value                  (#d additional doc string)
 #A# start
-    '...' '../..'
+    '...'  '../..'
     '....' '../../..'
-    'BG' '& exit'
-    'C' '| wc -l'
-    'G' '|& grep --color=auto'
-    'H' '| head'
-    'Hl' ' --help |& less -r'      #d (Display help in pager)
-    'L' '| less'
-    'LL' '|& less -r'
-    'M' '| most'
-    'N' '&>/dev/null'              #d (No Output)
-    'R' '| tr A-z N-za-m'          #d (ROT13)
-    'SL' '| sort | less'
-    'S' '| sort -u'
-    'T' '| tail'
-    'V' '|& vim -'
+    'BG'   '& exit'
+    'C'    '| wc -l'
+    'G'    '|& grep --color=auto '
+    'H'    '| head'
+    'Hl'   ' --help |& less -r'    #d (Display help in pager)
+    'L'    '| less'
+    'LL'   '|& less -r'
+    'M'    '| most'
+    'N'    '&>/dev/null'           #d (No Output)
+    'R'    '| tr A-z N-za-m'       #d (ROT13)
+    'SL'   '| sort | less'
+    'S'    '| sort -u'
+    'T'    '| tail'
+    'V'    '|& vim -'
 #A# end
-    'co' "./configure && make && sudo make install"
+    'co'   './configure && make && sudo make install'
 )
 
 globalias() {
@@ -965,6 +972,7 @@ setopt auto_pushd           # make cd push the old directory onto the directory
 setopt nonomatch            # try to avoid the 'zsh: no matches found...'
 setopt nobeep               # avoid "beep"ing
 setopt pushd_ignore_dups    # don't push the same dir twice.
+setopt noglobdots           # * shouldn't match dotfiles. ever.
 
 MAILCHECK=30       # mailchecks
 REPORTTIME=5       # report about cpu-/system-/user-time of command if running longer than 5 seconds
@@ -2921,7 +2929,11 @@ fi
 ### non-root (EUID != 0) code below
 ###
 
-(( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) && return 0
+if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then
+    zrclocal
+    return 0
+fi
+
 
 # variables {{{
 
@@ -4201,14 +4213,7 @@ fi
 
 #}}}
 
-# finally source a local zshrc {{{
-
-# this allows us to stay in sync with grml's zshrc and put own
-# modifications in ~/.zshrc.local
-
-xsource "${HOME}/.zshrc.local"
-
-# }}}
+zrclocal
 
 ## genrefcard.pl settings {{{