diff options
| author | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2014-01-24 12:39:58 +0100 |
|---|---|---|
| committer | Hugues Hiegel <hugues.hiegel@qosmos.com> | 2014-01-24 12:39:58 +0100 |
| commit | 1040af12c70ffd923e4dd1989a660c26e91e103e (patch) | |
| tree | ba064831e575ad8e3faa11fb78d24df113202ce9 | |
| parent | b68e23cd00915e94389fbe5f56508113655a1880 (diff) | |
| parent | a619da8a796876ac62857f54f41f444e2e12d087 (diff) | |
Merge branch 'master' into HackyGit
| -rw-r--r-- | 12_Prompts.zsh | 7 | ||||
| -rw-r--r-- | 60_Completion.zsh | 3 | ||||
| -rw-r--r-- | net:foret/Prompts.zsh | 5 | ||||
| -rw-r--r-- | net:foret/user:hiegel/Hashes.zsh | 1 | ||||
| -rw-r--r-- | user:hugues/Aliases.zsh | 3 | ||||
| -rw-r--r-- | user:hugues/KeyBindings.zsh | 8 | ||||
| m--------- | zsh-syntax-highlighting | 0 |
7 files changed, 13 insertions, 14 deletions
diff --git a/12_Prompts.zsh b/12_Prompts.zsh index f3139af..d49b947 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -229,10 +229,13 @@ __subvcsbranches () { # Get recursive submodules statuses for SUBMODULE in $(git config --get zsh.recurse-dirs) do - if [ -d $(dirname $GIT_DIR)/$SUBMODULE/.git -o -d $GIT_DIR/modules/$SUBMODULE ] + _sub=$(dirname $GIT_DIR)/$SUBMODULE/.git + [ ! -d $_sub ] && _sub=$(dirname $GIT_DIR)/modules/$SUBMODULE + if [ -d $_sub ] then GITBRANCH+=${GITBRANCH:+$(tput cuf1)} - GITBRANCH+=$C_$_prompt_colors[bar]$_C"[%{%B%}$SUBMODULE%{%b%}:" + _name=$(GIT_DIR=$_sub git config --get zsh.pretty-name ) + GITBRANCH+=$C_$_prompt_colors[bar]$_C"[%{%B%}"${_name:-$SUBMODULE}"%{%b%}:" GITBRANCH+=$(__get_git_fullstatus $(dirname $GIT_DIR)/$SUBMODULE) GITBRANCH+=$C_$_prompt_colors[bar]$_C"]" fi diff --git a/60_Completion.zsh b/60_Completion.zsh index a3561a2..69dae43 100644 --- a/60_Completion.zsh +++ b/60_Completion.zsh @@ -28,5 +28,8 @@ zstyle ':completion:*' squeeze-slashes true zstyle ':completion:*' use-compctl true # End of lines added by compinstall +typeset -A ZLS_COLOURS +ZLS_COLOURS[ma]=7 + autoload -Uz compinit compinit -i diff --git a/net:foret/Prompts.zsh b/net:foret/Prompts.zsh index a7d6722..d93120d 100644 --- a/net:foret/Prompts.zsh +++ b/net:foret/Prompts.zsh @@ -10,11 +10,6 @@ _prompt_colors[target]="1;31" -if ( id | grep -q Integration ) -then - sc "38;5;54" -fi - __static_dynamic () { [ $(( ${STATIC:-$(( 1 ^ ${DYNAMIC:-0} ))} + ${DYNAMIC:-$(( 1 ^ ${STATIC:-0} ))} )) -lt 2 ] && \ diff --git a/net:foret/user:hiegel/Hashes.zsh b/net:foret/user:hiegel/Hashes.zsh index 8f564ca..fc58d3c 100644 --- a/net:foret/user:hiegel/Hashes.zsh +++ b/net:foret/user:hiegel/Hashes.zsh @@ -1,4 +1,5 @@ hash -d work=/work/$USER hash -d share=/share/public/hugues +hash -d hugues=/home/hugues diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh index 435daa9..4a2322b 100644 --- a/user:hugues/Aliases.zsh +++ b/user:hugues/Aliases.zsh @@ -72,6 +72,9 @@ a lc='ls -c' a l1='\ls -1' a gitk='\gitk --date-order' +a gm='\git mergetool' +a grc='\git rebase --continue' +a gra='\git rebase --abort' __cmd_exists dict && a definition='dict -h dict.org' __cmd_exists dict && a traduction='dict -h hiegel.fr -P-' diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh index 1c4a693..fb241f4 100644 --- a/user:hugues/KeyBindings.zsh +++ b/user:hugues/KeyBindings.zsh @@ -164,15 +164,9 @@ bindkey -v # This setup may change the `ESC' keybinding to `C-d'. That defeats the # possibility to exit zsh by pressing `C-d' (which usually sends EOF). # With this widget, you can type `:q<RET>' to exit the shell from vicmd. -if [ $( _process_tree | grep -o zsh | wc -l ) -gt 1 ] -then - CONFIRM_EXIT="" -else - CONFIRM_EXIT="confirm " -fi function ft-zshexit { [[ -o hist_ignore_space ]] && BUFFER=' ' - BUFFER="${BUFFER}${CONFIRM_EXIT}exit" + BUFFER="${BUFFER}exit" zle .accept-line } zle -N q ft-zshexit diff --git a/zsh-syntax-highlighting b/zsh-syntax-highlighting -Subproject 45194671af8e1d6b37b16e214a58674762ab8e4 +Subproject f289a9f8e7a8a1752cd88f2366e6dacf8a0036e |