X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/8a075bd77648bf73909b42db74ef010a07a725f9..01ad59de5f6d5c9b2a81ffede8a00e4919e38f3d:/dot/zshrc

diff --git a/dot/zshrc b/dot/zshrc
index 8cedc67..3466d6c 100644
--- a/dot/zshrc
+++ b/dot/zshrc
@@ -5,8 +5,42 @@
 __mdw_shell=zsh
 case ${INSIDE_EMACS+t},$TERM in t,dumb) unsetopt zle ;; esac
 
+###--------------------------------------------------------------------------
+### History settings.
+
+## Put this here so that `.shellrc-local' can override.
+
+HISTFILE=~/.zsh-history
+HISTSIZE=1000
+SAVEHIST=1000
+
+###--------------------------------------------------------------------------
+### Hook implementation.
+
+__mdw_precmd_hook= __mdw_preexec_hook=
+
+__mdw_run_precmd_hook () { __mdw_runhook __mdw_precmd_hook; }
+__mdw_run_preexec_hook () { __mdw_runhook __mdw_preexec_hook "$2"; }
+
+precmd_functions+=(__mdw_run_precmd_hook)
+preexec_functions+=(__mdw_run_preexec_hook)
+
+###--------------------------------------------------------------------------
+### Common shell configuration.
+
 . "$HOME/.shell-rc"
 
+## Fixup: `zsh' has sane quoting rules.
+__mdw_runhook () {
+  local hk=$1 saverc=$? t i; shift
+
+  eval t=\${$hk+t}
+  case $t in t) ;; *) echo >&2 "unknown hook \`$hk'"; return 2; esac
+
+  eval t=\$$hk
+  for i in ${=t}; do __mdw_setrc $saverc; "$i" "$@"; done
+}
+
 ###--------------------------------------------------------------------------
 ### Prompt hacking.
 
@@ -14,7 +48,7 @@ __mdw_set_prompt_hacks () {
   case $TERM in
     linux*|screen*|xterm*|putty*|vt100*|eterm*)
       bold=%B unbold=%b
-      gitcolour=%F{cyan} rccolour=%F{red} uncolour=%f
+      gitcolour=%F{cyan} extracolour=%F{yellow} rccolour=%F{red} uncolour=%f
       ;;
   esac
   host=%m dir=" %(6~!%-1~/.../%4~!%~)"
@@ -24,8 +58,6 @@ __mdw_set_prompt_hacks () {
 if [ -t 0 ]; then
   __mdw_source_if_exists /usr/lib/git-core/git-sh-prompt
   __mdw_set_prompt_pieces
-  precmd_functions+=(__mdw_precmd)
-  preexec_functions+=(__mdw_preexec)
 fi
 
 ###--------------------------------------------------------------------------
@@ -48,6 +80,7 @@ do
   zstyle ':zle:*-bash' word-chars ""
   zstyle ':zle:*-shell' word-style shell
   zstyle ':zle:*-shell' skip-whitespace-first false
+  zstyle ':completion:*' rehash true
 done
 
 bindkey "\eb" backward-word-bash
@@ -132,15 +165,12 @@ compdef _ssh @
 ###--------------------------------------------------------------------------
 ### Other shell tweaking.
 
-HISTFILE=~/.zsh-history
-HISTSIZE=1000
-SAVEHIST=1000
-
 unsetopt auto_cd
 unsetopt auto_menu
 setopt bang_hist
 unsetopt bash_auto_list
 unsetopt beep
+setopt c_bases octal_zeroes
 setopt extendedglob
 unsetopt flow_control
 unsetopt global_export
@@ -155,6 +185,7 @@ unsetopt nomatch
 unsetopt menu_complete
 setopt notify
 setopt rc_expand_param
+setopt rc_quotes
 setopt share_history
 
 hash -d t=$TMPDIR