~mdw
/
profile
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dot/bashrc, dot/zshrc: Promote invoking the common config.
[profile]
/
dot
/
zshrc
diff --git
a/dot/zshrc
b/dot/zshrc
index
f6b205a
..
a43697d
100644
(file)
--- a/
dot/zshrc
+++ b/
dot/zshrc
@@
-5,6
+5,9
@@
__mdw_shell=zsh
case ${INSIDE_EMACS+t},$TERM in t,dumb) unsetopt zle ;; esac
__mdw_shell=zsh
case ${INSIDE_EMACS+t},$TERM in t,dumb) unsetopt zle ;; esac
+###--------------------------------------------------------------------------
+### Common shell configuration.
+
. "$HOME/.shell-rc"
###--------------------------------------------------------------------------
. "$HOME/.shell-rc"
###--------------------------------------------------------------------------
@@
-12,12
+15,12
@@
case ${INSIDE_EMACS+t},$TERM in t,dumb) unsetopt zle ;; esac
__mdw_set_prompt_hacks () {
case $TERM in
__mdw_set_prompt_hacks () {
case $TERM in
- linux*|screen*|xterm*|vt100*|eterm*)
+ linux*|screen*|xterm*|
putty*|
vt100*|eterm*)
bold=%B unbold=%b
gitcolour=%F{cyan} rccolour=%F{red} uncolour=%f
;;
esac
bold=%B unbold=%b
gitcolour=%F{cyan} rccolour=%F{red} uncolour=%f
;;
esac
- host=%m dir=" %(6~!%-1~/.../%
5
~!%~)"
+ host=%m dir=" %(6~!%-1~/.../%
4
~!%~)"
more=%F{green}%_%f
}
more=%F{green}%_%f
}
@@
-83,6
+86,12
@@
bindkey -s "\eOp" "0" "\eOn" "."; bindkey "\eOM" accept-line
bindkey "\ep" history-beginning-search-backward
bindkey "\en" history-beginning-search-forward
bindkey "\ep" history-beginning-search-backward
bindkey "\en" history-beginning-search-forward
+bindkey "\e," _history-complete-older
+
+for i in '!' '$' '@' '/' '~'; do
+ bindkey "\e$i" _bash_complete-word
+ bindkey "^X$i" _bash_list-choices
+done
setopt interactive_comments
bindkey "\e#" pound-insert
setopt interactive_comments
bindkey "\e#" pound-insert
@@
-141,7
+150,7
@@
unsetopt global_export
setopt glob_star_short
setopt hist_ignore_all_dups
setopt hist_ignore_space
setopt glob_star_short
setopt hist_ignore_all_dups
setopt hist_ignore_space
-setopt ksh_glob
+
un
setopt ksh_glob
setopt list_ambiguous
setopt list_packed
setopt multios
setopt list_ambiguous
setopt list_packed
setopt multios
@@
-151,6
+160,8
@@
setopt notify
setopt rc_expand_param
setopt share_history
setopt rc_expand_param
setopt share_history
+hash -d t=$TMPDIR
+
###--------------------------------------------------------------------------
### Finishing touches.
###--------------------------------------------------------------------------
### Finishing touches.