Merge remote-tracking branch 'staging'

[profile] / dot / zshrc

diff --git a/dot/zshrc b/dot/zshrc
index 3cf00dc492eb8e47c3b8d4900baeb77841f2d153..f6b205a0131995bb134575189648fecb26e241e5 100644 (file)
--- a/dot/zshrc
+++ b/dot/zshrc
@@ -18,6 +18,7 @@ __mdw_set_prompt_hacks () {
       ;;
   esac
   host=%m dir=" %(6~!%-1~/.../%5~!%~)"
+  more=%F{green}%_%f
 }
 
 if [ -t 0 ]; then
@@ -66,6 +67,20 @@ bindkey "\e^l" down-case-word-shell
 bindkey "\ec" capitalize-word-bash
 bindkey "\e^c" capitalize-word-shell
 
+bindkey "\e[1~" beginning-of-line "\e[4~" end-of-line
+
+bindkey -s           "\eOQ" "/" "\eOR" "*" "\eOS" "-"
+bindkey -s "\eOw" "7" "\eOx" "8" "\eOy" "9"
+bindkey -s "\eOt" "4" "\eOu" "5" "\eOv" "6" "\eOk" "+"
+bindkey -s "\eOq" "1" "\eOr" "2" "\eOs" "3"
+bindkey -s "\eOp" "0"           "\eOn" "."; bindkey "\eOM" accept-line
+
+bindkey -s           "\eOQ" "/" "\eOR" "*" "\eOS" "-"
+bindkey -s "\eOw" "7" "\eOx" "8" "\eOy" "9"
+bindkey -s "\eOt" "4" "\eOu" "5" "\eOv" "6" "\eOk" "+"
+bindkey -s "\eOq" "1" "\eOr" "2" "\eOs" "3"
+bindkey -s "\eOp" "0"           "\eOn" "."; bindkey "\eOM" accept-line
+
 bindkey "\ep" history-beginning-search-backward
 bindkey "\en" history-beginning-search-forward
 
@@ -122,6 +137,8 @@ unsetopt bash_auto_list
 unsetopt beep
 setopt extendedglob
 unsetopt flow_control
+unsetopt global_export
+setopt glob_star_short
 setopt hist_ignore_all_dups
 setopt hist_ignore_space
 setopt ksh_glob
@@ -137,6 +154,7 @@ setopt share_history
 ###--------------------------------------------------------------------------
 ### Finishing touches.
 
+## Local tweaks.
 __mdw_source_if_exists "$HOME/.zshrc-local"
 
 ###----- That's all, folks --------------------------------------------------