diff options
| author | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
|---|---|---|
| committer | Henry Yan <yanhonglei@gmail.com> | 2012-07-17 00:36:50 +0800 |
| commit | 4a11d2c35c7a526e648b37a5b02b7695be46b16a (patch) | |
| tree | 1eb542466758885ee40f3f60cc57d6438f38dc4d /lib | |
| parent | e9feccf6a94f9f5238ff0b3501f62575d14ae148 (diff) | |
| parent | 11034217a7ea3cffe6e0fe631837c518b8c7e1a5 (diff) | |
| download | zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.gz zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.tar.bz2 zsh-4a11d2c35c7a526e648b37a5b02b7695be46b16a.zip | |
merge from upstream master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/completion.zsh | 2 | ||||
| -rw-r--r-- | lib/directories.zsh | 4 | ||||
| -rw-r--r-- | lib/key-bindings.zsh | 1 | ||||
| -rw-r--r-- | lib/misc.zsh | 2 | ||||
| -rw-r--r-- | lib/termsupport.zsh | 4 |
5 files changed, 7 insertions, 6 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index b964595ed..f31e101d5 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -46,7 +46,7 @@ zstyle ':completion:*:hosts' hosts $hosts # Use caching so that commands like apt and dpkg complete are useable zstyle ':completion::complete:*' use-cache 1 -zstyle ':completion::complete:*' cache-path ~/.oh-my-zsh/cache/ +zstyle ':completion::complete:*' cache-path $ZSH/cache/ # Don't complete uninteresting users zstyle ':completion:*:*:*:users' ignored-patterns \ diff --git a/lib/directories.zsh b/lib/directories.zsh index bb114f615..a787db9eb 100644 --- a/lib/directories.zsh +++ b/lib/directories.zsh @@ -36,9 +36,9 @@ cd () { alias md='mkdir -p' alias rd=rmdir -alias d='dirs -v' +alias d='dirs -v | head -10' # mkdir & cd to it function mcd() { mkdir -p "$1" && cd "$1"; -}
\ No newline at end of file +} diff --git a/lib/key-bindings.zsh b/lib/key-bindings.zsh index 5c1b90bfa..5f499f3e8 100644 --- a/lib/key-bindings.zsh +++ b/lib/key-bindings.zsh @@ -3,7 +3,6 @@ bindkey -e bindkey '\ew' kill-region bindkey -s '\el' "ls\n" -bindkey -s '\e.' "..\n" bindkey '^r' history-incremental-search-backward bindkey "^[[5~" up-line-or-history bindkey "^[[6~" down-line-or-history diff --git a/lib/misc.zsh b/lib/misc.zsh index 88732e664..0f7e7e925 100644 --- a/lib/misc.zsh +++ b/lib/misc.zsh @@ -9,5 +9,5 @@ bindkey "^[m" copy-prev-shell-word setopt long_list_jobs ## pager -export PAGER=less +export PAGER="less -R" export LC_CTYPE=$LANG diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index 221989502..e26fef6d3 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -3,7 +3,9 @@ #Fully support screen, iterm, and probably most modern xterm and rxvt #Limited support for Apple Terminal (Terminal can't set window or tab separately) function title { - [ "$DISABLE_AUTO_TITLE" != "true" ] || return + if [[ "$DISABLE_AUTO_TITLE" == "true" ]] || [[ "$EMACS" == *term* ]]; then + return + fi if [[ "$TERM" == screen* ]]; then print -Pn "\ek$1:q\e\\" #set screen hardstatus, usually truncated at 20 chars elif [[ "$TERM" == xterm* ]] || [[ $TERM == rxvt* ]] || [[ "$TERM_PROGRAM" == "iTerm.app" ]]; then |