diff options
| author | Hugues Hiegel <hugues@hiegel.fr> | 2008-05-24 12:02:06 +0200 |
|---|---|---|
| committer | Hugues Hiegel <hugues@hiegel.fr> | 2008-05-24 12:02:06 +0200 |
| commit | 6d127fd3274dcd551e175a9c0440f80aebcb2fc2 (patch) | |
| tree | 407e5d13acc9c5977a204c621625f48a5a6dc384 /user:hugues | |
| parent | e2f9a952558aea3a37296f45dc911f109342748a (diff) | |
| parent | bb76357c72d67b5eab803fccce27617d178f7ed3 (diff) | |
Merge branch 'master' of ssh://ssh.hiegel.fr/work/repos/zdotdir
Conflicts:
host:prunelle/Aliases.zsh
host:prunelle/Environment.zsh
host:prunelle/README
net:ordener.fr
net:ordener.fr/host:prunelle/Aliases.zsh
net:ordener.fr/host:prunelle/Environment.zsh
net:ordener.fr/host:prunelle/README
net:sweethome/host:prunelle/Aliases.zsh
net:sweethome/host:prunelle/Environment.zsh
net:sweethome/host:prunelle/README
user:hugues/KeyBindings.zsh
Diffstat (limited to 'user:hugues')
| -rw-r--r-- | user:hugues/Environment.zsh | 2 | ||||
| -rw-r--r-- | user:hugues/KeyBindings.zsh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/user:hugues/Environment.zsh b/user:hugues/Environment.zsh index bf64adc..7b99de4 100644 --- a/user:hugues/Environment.zsh +++ b/user:hugues/Environment.zsh @@ -33,7 +33,7 @@ export LC_MESSAGES=${LC_MESSAGES:-fr_FR} unset LANG # Unuseful # Couleurs pour grep --color=auto -export GREP_COLOR=$YELLOW\;$BOLD +export GREP_COLOR=$color[yellow]\;$color[bold] cmd_exists dircolors && eval $(dircolors ~/.dir_colors) export TZ="Europe/Paris" diff --git a/user:hugues/KeyBindings.zsh b/user:hugues/KeyBindings.zsh index a49dd90..f87c53b 100644 --- a/user:hugues/KeyBindings.zsh +++ b/user:hugues/KeyBindings.zsh @@ -211,7 +211,7 @@ bindkey -s 't' 'Q todo\n' bindkey -s 'é' ' 2>/dev/null ' bindkey -s '2' ' 2>&1 ' -bindkey -s 'm' 'Q make\n' +bindkey -s 'm' 'Q mails\n' bindkey -s 'M' 'Q make\n' bindkey -s 'l' 'Q l\n' |