Attempting to speed things up a bit.

+ misc other changes
mattfoster · May 2, 2012 · f94e0ab · f94e0ab
1 parent ade55c5
commit f94e0ab
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 3 deletions.
diff --git a/03_zkbd b/03_zkbd
@@ -3,3 +3,5 @@ if [[ -f ~/.zkbd/$TERM-$VENDOR-$OSTYPE ]]; then
 else
 	source $mydir/default_zkbd
 fi
+
+bindkey -e
diff --git a/05_editor b/05_editor
@@ -4,7 +4,7 @@ export GIT_EDITOR
 
 # Define an order or preference for text editors
 local editors
-editors=(mate mvim gvim vim vi nano pico)
+editors=(vim mate mvim gvim nano pico)
 
 # Look for the first of these editors which exists
 for editor ($editors) {

diff --git a/10_bindkey b/10_bindkey
@@ -6,7 +6,11 @@ bindkey " " magic-space
 
 bindkey "^Og" noglob-command-line
 bindkey "^Os" sudo-command-line
+bindkey "^Ol" less-command-line
+bindkey "^OL" less-command-line-output
+bindkey "^Oh" sub-command-line
 
 bindkey "^[^[[D" backward-word 
 bindkey "^[^[[C" forward-word
 
+bindkey "^h" run-help
diff --git a/02_update → disabled/02_update b/02_update → disabled/02_update
diff --git a/05_python → disabled/05_python b/05_python → disabled/05_python
diff --git a/05_ruby → disabled/05_ruby b/05_ruby → disabled/05_ruby
diff --git a/05_seq → disabled/05_seq b/05_seq → disabled/05_seq
diff --git a/05_video → disabled/05_video b/05_video → disabled/05_video
diff --git a/06_zmv → disabled/06_zmv b/06_zmv → disabled/06_zmv
diff --git a/09_abbreviations → disabled/09_abbreviations b/09_abbreviations → disabled/09_abbreviations
@@ -80,6 +80,26 @@ sudo-command-line() {
 }
 zle -N sudo-command-line
 
+
+less-command-line() {
+    [[ -z $BUFFER ]] && zle up-history
+    [[ $BUFFER != less\ * ]] && BUFFER="less $BUFFER"
+}
+zle -N less-command-line
+
+less-command-line-output() {
+    [[ -z $BUFFER ]] && zle up-history
+    [[ $BUFFER != less\ * ]] && BUFFER="less \$($BUFFER)"
+}
+zle -N less-command-line-output
+
+sub-command-line() {
+    BUF=$BUFFER
+    zle up-history
+    BUFFER="$BUF \$($BUFFER)"
+}
+zle -N sub-command-line
+
 # run command line with noglob set:
 noglob-command-line() {
     [[ -z $BUFFER ]] && zle up-history

diff --git a/func/prompt_minimal_vcs_setup b/func/prompt_minimal_vcs_setup
@@ -25,9 +25,11 @@ function prompt_minimal_vcs_setup {
   if is-at-least 4.3.7 || [[ $SHLVL == 1 ]]; then
     PS1='%{$fg_bold[$d_col]%}%1~ %{$fg_bold[$b_col]%}${vcs_info_msg_0_}%(?.%{$fg_bold[$n_tru]%}.%{$fg[$n_fal]%})%# %{$reset_color%}'
     PS2='%_ %{$fg_bold[$d_col]%}→ %{$reset_color%}'  
+    PS4=$'+ $(/usr/local/bin/gdate "+%s.%N")\011 '
   else  
     PS1='%B%F{$d_col}%1~ %F{$b_col}${vcs_info_msg_0_}%(?.%F{$n_tru}.%F{$n_fal})%# %F{white}'
     PS2='%_ %B%F{$d_col}→ %F{white}'
+    PS4=$'+ $(/usr/local/bin/gdate "+%s.%N")\011 '
   fi
 }
 

diff --git a/rc b/rc
@@ -60,7 +60,6 @@ zstyle ':completion:*:tar:*' files '*.tar|*.tgz|*.tz|*.tar.Z|*.tar.bz2|*.tZ|*.ta
 # for printing
 zstyle ':completion:*:xdvi:*' files '*.dvi'
 zstyle ':completion:*:dvips:*' files '*.dvi'
-
 # Group relatex matches:
 zstyle ':completion:*' group-name ''
 zstyle ':completion:*:-command-:*:(commands|builtins|reserved-words-aliases)' group-name commands
@@ -107,11 +106,13 @@ autoload -Uz is-at-least
 
 if is-at-least 4.3.6; then
   autoload -Uz vcs_info
+  zstyle ':vcs_info:*' disable cdv darcs mtn p4 svk tla
+  zstyle ':vcs_info:*' enable git cvs svn hg bzr
+  zstyle ':vcs_info:*' get-revision true
   zstyle ':vcs_info:*' formats '%b '
   zstyle ':vcs_info:(svn|bzr|cvs):*' branchformat '%b:%r'
   zstyle ':vcs_info:cvs:*' branchformat '%r '
   zstyle ':vcs_info:bzr:*' use-simple true 
-  zstyle ':vcs_info:*' enable git cvs svn hg bzr
   # vcs_info also needs to be in precmd, see: 10_hooks
   vcs_info
 fi