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

diff --git a/zsh/rc b/zsh/rc
index 8b5a333..7f05bbf 100644
--- a/zsh/rc
+++ b/zsh/rc
@@ -418,6 +418,8 @@ zshrc_prompt_precmd() {
     local background="%(1j.${yellow}%j${default}.)"
     # Exit code in bright red in parentheses if not zero.
     local exitcode="%(?..(${red}%B%?%b${default}%) )"
+    # Prompt symbol, % for normal users, # in red for root.
+    local symbol="%(!.${red}#${default}.%%)"
 
     # Prefix characters in first and second line.
     local top_prefix="${blue}%B.-%b${default}"
@@ -452,7 +454,7 @@ zshrc_prompt_precmd() {
     local top_separator="%B${blue}${(l:${width}::-:)}%b${default}"
 
     PROMPT="${top_prefix}${top_left}${top_separator}${top_right}
-${bottom_prefix}${user}@${host} ${background}%# ${exitcode}"
+${bottom_prefix}${user}@${host} ${background}${symbol} ${exitcode}"
 }
 precmd_functions+=(zshrc_prompt_precmd)
 
@@ -561,7 +563,7 @@ if [[ $TERM == screen* || $TERM == xterm* || $TERM == rxvt* ]]; then
             name=.zsh
         fi
 
-        # Prepend prefixes like in window_preexec().
+        # Prepend prefixes like in zshrc_window_preexec().
         if [[ $UID -eq 0 ]]; then
             name="!$name"
         fi
@@ -844,8 +846,10 @@ fi
 
 # LOAD ADDITIONAL CONFIGURATION FILES
 
-# Configuration option for rc.local to use GNU screen/tmux. By default GNU
-# screen is used. Possible values: screen, tmux and empty (no value).
+# Configuration options for rc.local.
+
+# Multiplexer to use. By default GNU screen is used. Possible values: screen,
+# tmux and empty (no multiplexer).
 zshrc_use_multiplexer=screen
 
 source_config ~/.zsh/rc.local
@@ -853,6 +857,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.
@@ -889,7 +902,7 @@ if [[ $TERM != dumb && $TERM != linux && -z $STY && -z $TMUX ]]; then
     fi
 fi
 
-# Colorize stderr in red. Very useful when looking for errors. Thanks to
+# Colorize stderr in bold red. Very useful when looking for errors. Thanks to
 # http://gentoo-wiki.com/wiki/Zsh for the basic script and Mikachu in #zsh on
 # Freenode (2010-03-07 04:03 CET) for some improvements (-r, printf). It's not
 # yet perfect and doesn't work with su and git for example, but it can handle