zsh/rc: Simplify prompts with color variables.

No functional changes.

diff --git a/zsh/rc b/zsh/rc
index 45c8ea5c89ef974f59e6f1cdca0d53af9eef84f7..3db835308e47d919cdbacc722de3f8f1504086cf 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -125,15 +125,21 @@ bindkey -a "^N" history-beginning-search-forward
 # Use colorized output, necessary for prompts and completions.
 autoload -U colors && colors
 
+# Some shortcuts for colors.
+local red="%{${fg[red]}%}"
+local blue="%{${fg[blue]}%}"
+local green="%{${fg[green]}%}"
+local yellow="%{${fg[yellow]}%}"
+local default="%{${fg[default]}%}"
+
 # Set the default prompt. The current host and working directory is displayed,
 # the exit code of the last command if it wasn't 0, the number of running jobs
 # if not 0 and a + if this shell is running inside another shell.
 # The prompt is in green and blue to make easily detectable, the error exit
 # code in red and bold and the job count in yellow.
-PROMPT="%{${fg[green]}%}%B%m%b%{${fg[default]}%}:\
-%{${fg[blue]}%}%B%~%b%{${fg[default]}%} \
-%(1j.%{${fg[yellow]}%}%j%{${fg[default]}%}.)%(2L.+.)%# \
-%(?..(%{${fg[red]}%}%B%?%b%{${fg[default]}%}%) )"
+PROMPT="$green%B%m%b$default:$blue%B%~%b$default \
+%(1j.$yellow%j$default.)%(2L.+.)%# \
+%(?..($red%B%?%b$default%) )"
 
 # VCS_Info was added in 4.3.9 but it works in earlier versions too. So load it
 # if the necessary files are available in ~/.zsh/functions/vcs_info (often a
@@ -158,12 +164,9 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     # is displayed. If there is an special action going on (merge, rebase)
     # it's also displayed (red).
     zstyle ':vcs_info:*' formats \
-    "(%{${fg[green]}%}%b%{${fg[default]}%}:\
-%{${fg[blue]}%}%s%{${fg[default]}%})"
+        "($green%b$default:$blue%s$default)"
     zstyle ':vcs_info:*' actionformats \
-    "(%{${fg[green]}%}%b%{${fg[default]}%}/\
-%{${fg[red]}%}%a%{${fg[default]}%}:\
-%{${fg[blue]}%}%s%{${fg[default]}%})"
+        "($green%b$default/$red%a$default:$blue%s$default)"
     # Call VCS_info as precmd before every prompt.
     prompt_precmd() {
         vcs_info
@@ -181,6 +184,8 @@ if [[ $ZSH_VERSION == (4.3.<9->|4.<4->*|<5->*) ||
     fi
 fi
 
+unset red blue green yellow default
+
 # When screen, xterm or rxvt is used set the name of the window to the
 # currently running program.
 #