From: Simon Ruderich <simon@ruderich.org>
Date: Fri, 24 Apr 2009 22:16:27 +0000 (+0200)
Subject: zsh: Reorder aliases and functions section.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=ba733a055d7c26cf7ef37130166e88b6fcd0501e;p=config%2Fdotfiles.git

zsh: Reorder aliases and functions section.

Now they are ordered more logically. No functional changes.
---

diff --git a/zsh/rc b/zsh/rc
index 6d2b806..b82f75f 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -322,6 +322,23 @@ zstyle ':completion:*:(hg|git)*:*' ignore-line yes
 
 # CUSTOM ALIASES AND FUNCTIONS
 
+# If ^C is pressed while typing a command, add it to the history so it can be
+# easily retrieved later and then abort like ^C normally does. This is useful
+# when I want to abort an command to do something in between and then finish
+# typing the command.
+TRAPINT() {
+    # Store the current buffer in the history.
+    zle && print -s $BUFFER
+
+    # Return the default exit code so zsh aborts the current command.
+    return $1
+}
+
+# Colorize stderr. Very useful when looking for errors. Thanks to
+# http://gentoo-wiki.com/wiki/Zsh
+exec 2>>(while read line; do
+    print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &)
+
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
@@ -332,19 +349,10 @@ alias -g D='E | colordiff L'
 alias -g G='| grep'
 alias -g S='| sort'
 
-# Automatically use unified diffs.
-alias diff='diff -u'
-
-# Display all files and use human readable sizes.
-alias du='du -sh'
-
-# Use human readable sizes.
-alias df='df -h'
-
-# Multiple files given to Vim are opened in tabs, supported since Vim 7.
-if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then
-    alias vim='vim -p'
-fi
+# Make going up directories simple.
+alias -g ...='../..'
+alias -g ....='../../..'
+alias -g .....='../../../..'
 
 # Shortcuts for often used programs.
 alias e='elinks'
@@ -353,20 +361,6 @@ alias m='mutt'
 alias v='vim'
 alias vi='vim'
 
-# I sometimes confuse editor and shell, print a warning to prevent I exit the
-# shell.
-alias :q='echo "This is not Vim!" >&2'
-
-# Edit the mercurial patch queue series file for the current mercurial
-# repository in Vim. Also change Vim's pwd to the patches directory so other
-# patches can easily be opened.
-alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
-
-# Make going up directories simple.
-alias -g ...='../..'
-alias -g ....='../../..'
-alias -g .....='../../../..'
-
 # Improved ls which displays the files in columns (-C), visualizes
 # directories, links and other special files (-F) and pages everything through
 # less (L).
@@ -393,22 +387,28 @@ function ll() {
     la -l $*
 }
 
-# If ^C is pressed while typing a command, add it to the history so it can be
-# easily retrieved later and then abort like ^C normally does. This is useful
-# when I want to abort an command to do something in between and then finish
-# typing the command.
-TRAPINT() {
-    # Store the current buffer in the history.
-    zle && print -s $BUFFER
+# Multiple files given to Vim are opened in tabs, supported since Vim 7.
+if [[ ${${${(f)"$(vim --version)"}[1]#VIM - Vi IMproved }%% *} == 7* ]]; then
+    alias vim='vim -p'
+fi
 
-    # Return the default exit code so zsh aborts the current command.
-    return $1
-}
+# I sometimes confuse editor and shell, print a warning to prevent I exit the
+# shell.
+alias :q='echo "This is not Vim!" >&2'
 
-# Colorize stderr. Very useful when looking for errors. Thanks to
-# http://gentoo-wiki.com/wiki/Zsh
-exec 2>>(while read line; do
-    print '\e[91m'${(q)line}'\e[0m' > /dev/tty; print -n $'\0'; done &)
+# Automatically use unified diffs.
+alias diff='diff -u'
+
+# Display all files and use human readable sizes.
+alias du='du -sh'
+
+# Use human readable sizes.
+alias df='df -h'
+
+# Edit the mercurial patch queue series file for the current mercurial
+# repository in Vim. Also change Vim's pwd to the patches directory so other
+# patches can easily be opened.
+alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
 
 
 # RUN COMMANDS