Improved trap function to simply add the aborted command to the history.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index 17fb0cb34cd60d266566f7dd38a93d6a81e2e3fa..088c53dc6d9798990241a7c1847f8cc58505fa88 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -4,7 +4,7 @@
 # Use Vi(m) style key bindings.
 bindkey -v
 
-# Use the history and store it in ~/.zsh/history.
+# Use history and store it in ~/.zsh/history.
 HISTSIZE=1000
 SAVEHIST=1000
 HISTFILE=~/.zsh/history
@@ -40,36 +40,38 @@ PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
 %{${fg[blue]}%}%B%~%b%{${fg[default]}%} %(2L.+.)%# \
 %(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
 
-# Use the new completion system.
+# Use new completion system.
 autoload -U compinit && compinit
-# Make sure the list of possible completions is displayed after pressing <Tab>
+# Make sure the list of possible completions is displayed after pressing <TAB>
 # the first time.
 setopt nolistambiguous
-# Use a cache to speed up completions.
+# Use cache to speed up completions.
 zstyle ':completion:*' use-cache on
 zstyle ':completion:*' cache-path ~/.zsh/cache
-# Ignore the case if the currently typed string doesn't match.
+# Ignore case if currently typed string doesn't match.
 zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}'
 
 # Enable zsh's extended glob abilities.
 setopt extendedglob
 
-# If ^C is pressed while typing a command, copy it in the kill buffer so it can
-# be "yanked" 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.
+# 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() {
-    # Kill the current buffer so it gets stored and can be retrieved later with
-    # "yank". Then yank it so it gets displayed (otherwise I don't know which
-    # command I aborted).
-    zle && zle kill-buffer && zle yank
+    # Store the current buffer in the history.
+    zle && print -s $BUFFER
 
-    # Return the default exit code so zsh aborts the current command line.
+    # Return the default exit code so zsh aborts the current command.
     return $1
 }
-# Make sure ^Y is bound to yank, necessary for the TRAPINT function to work as
-# excepted.
-bindkey "^Y" yank
+
+# Simplify calls to less, automatically redirects all output.
+alias -g L='2>&1 | less'
+# Simplify calls to colordiff, output is also piped through less.
+alias -g D='2>&1 | colordiff L'
+# Simplify calls to grep.
+alias -g G='| grep'
 
 
 # If a rc.local file exists load it, otherwise load a rc file for the current