X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=c1ee1d4aa2236ec8f3306fd230eb14b55336640f;hb=37a28c07c5752711e5d1f4686a2b3f17d62ce3b7;hp=c7a964e131ad074fc8c45788b71f3e63a768d08f;hpb=3c57d4b7e78e5f698e5659de4c71ba6df64be44a;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index c7a964e..c1ee1d4 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -86,7 +86,7 @@ setopt longlistjobs
 # Use Vi(m) style key bindings.
 bindkey -v
 
-# Use jk to exit insert mode (jj is too slow).
+# Use jk to exit insert mode (jj is too slow to type).
 bindkey 'jk' vi-cmd-mode
 
 # I don't need the arrow keys, I use ^N and ^P for this (see below).
@@ -184,12 +184,12 @@ bindkey -a '^N' history-beginning-search-forward
 
 # Enable incremental search which is especially useful when the string is an
 # argument and not the command.
-bindkey '^R' history-incremental-search-backward
+bindkey '^R' history-incremental-pattern-search-backward
 # Also enable my usual use of Ctrl-P/Ctrl-N to get the previous/next matching
 # history entry.
 if [[ $ZSH_VERSION == (4.<4->*|<5->*) ]]; then
-    bindkey -M isearch '^P' history-incremental-search-backward
-    bindkey -M isearch '^N' history-incremental-search-forward
+    bindkey -M isearch '^P' history-incremental-pattern-search-backward
+    bindkey -M isearch '^N' history-incremental-pattern-search-forward
 fi
 
 # Automatically push cd-ed directories on the directory stack.
@@ -211,7 +211,8 @@ autoload -Uz colors; colors
 zmodload zsh/datetime
 
 # Some shortcuts for colors. The %{...%} tells zsh that the data in between
-# doesn't need any space, necessary for correct prompt drawing.
+# doesn't need any space, necessary for correct prompt drawing. Use %F{color}
+# in more recent zsh versions (here compatibility is important).
 local red="%{${fg[red]}%}"
 local blue="%{${fg[blue]}%}"
 local green="%{${fg[green]}%}"
@@ -777,7 +778,7 @@ zle -C complete-files complete-word _generic
 zstyle ':completion:complete-files:*' completer _files
 bindkey '^F' complete-files
 
-# Completion for my wrapper scripts
+# Completion for my wrapper scripts.
 compdef slocate=locate
 compdef srsync=rsync
 compdef srsync-incremental=rsync
@@ -1047,7 +1048,7 @@ zshrc_restart_precmd() {
     fi
 
     # Try to start a new interactive shell. If it fails, something is wrong.
-    # Don't kill our current session by execing it.
+    # Don't kill our current session by execing it, abort instead.
     zsh -i -c 'exit 42'
     if [[ $? -ne 42 ]]; then
         echo -n ${fg_bold[red]}