X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=zsh%2Frc;h=6b646b5a42ccec8a8bdbb2e55e6ea5e23ec3530a;hb=00f6bae72e77b3772413cfa5b7cf790b6e670935;hp=fc4b4f3bae9d8bd7da569ac6c08e571e7a1c2554;hpb=484454a67b35f306ca67fcf08093bb657106e4f9;p=config%2Fdotfiles.git

diff --git a/zsh/rc b/zsh/rc
index fc4b4f3..6b646b5 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -220,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
@@ -853,6 +853,15 @@ source_config ~/.zsh/rc.local
 
 # RUN COMMANDS
 
+# Make sure the multiplexer is available. Otherwise the exec terminates our
+# session.
+if [[ -n $zshrc_use_multiplexer ]]; then
+    if ! (( $+commands[$zshrc_use_multiplexer] )); then
+        echo "Multiplexer '$zshrc_use_multiplexer' not found." >&2
+        zshrc_use_multiplexer=
+    fi
+fi
+
 # If not already in screen or tmux, reattach to a running session or create a
 # new one. This also starts screen/tmux on a remote server when connecting
 # through ssh.
@@ -903,6 +912,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() {