X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=8b5a333ccdbbf066c53f68bc5a69e96c31612c6b;hb=7c8df26e7c76c966e998d1eb9408846ba3fa62fa;hp=7f5b1b0cc0eb52b3ed41ea7eb068ce61920bcbf2;hpb=7e488d605fa736d2353c1c5e1f57ecf241edbda2;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index 7f5b1b0..8b5a333 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -85,8 +85,7 @@ setopt ignoreeof
 # Use Vi(m) style key bindings.
 bindkey -v
 
-# Use jj and jk to exit insert mode.
-bindkey 'jj' vi-cmd-mode
+# Use jk to exit insert mode (jj is too slow).
 bindkey 'jk' vi-cmd-mode
 
 # I don't need the arrow keys, I use ^N and ^P for this (see below).
@@ -221,8 +220,8 @@ if [[ $ZSH_VERSION == (4.3.<9->*|4.<4->*|<5->*) ||
 
     # Load vcs_info to display information about version control repositories.
     autoload -Uz vcs_info
-    # Only look for git and mercurial repositories; the only I use.
-    zstyle ':vcs_info:*' enable git hg
+    # Only look for certain VCS.
+    zstyle ':vcs_info:*' enable git
     # Check the repository for changes so they can be used in %u/%c (see
     # below). This comes with a speed penalty for bigger repositories.
     zstyle ':vcs_info:*' check-for-changes yes
@@ -904,6 +903,17 @@ exec 2>>(while read -r -k -u 0 line; do
     print -n $'\0'
 done &)
 
+# Display possible log messages from ~/.xinitrc (if `xmessage` wasn't
+# installed). No race condition as xinitrc has finished before a shell is
+# executed and only one shell is started on login.
+if [[ -f ~/.xinitrc.errors ]]; then
+    echo "${fg_bold[red]}xinitrc failed!${fg_bold[default]}"
+    echo
+    cat ~/.xinitrc.errors
+    rm ~/.xinitrc.errors
+    echo
+fi
+
 # Run the following programs every 4 hours (and when zsh starts).
 PERIOD=14400
 periodic() {