summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2009-10-26 08:57:29 -0700
committerRobby Russell <robby@planetargon.com>2009-10-26 08:57:29 -0700
commit56693663adbf9d8c5809612bd23324e90ceb4cd6 (patch)
tree8057e0b86e7f6a2a05fbb1a192180b3b34c66268
parentc03aab51645fa7448f4e92b09ab00e2de989010e (diff)
parentc1444a96129b665bcbf67e9baad9bf7257c7c650 (diff)
downloadzsh-56693663adbf9d8c5809612bd23324e90ceb4cd6.tar.gz
zsh-56693663adbf9d8c5809612bd23324e90ceb4cd6.tar.bz2
zsh-56693663adbf9d8c5809612bd23324e90ceb4cd6.zip
Merge branch 'master' of git://github.com/mdonoughe/oh-my-zsh into mdonoughe/master
-rw-r--r--lib/completion.zsh9
-rw-r--r--templates/zshrc.zsh-template3
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh
index 795903d0d..68ca3b4c1 100644
--- a/lib/completion.zsh
+++ b/lib/completion.zsh
@@ -14,7 +14,12 @@ compinit
zmodload -i zsh/complist
## case-insensitive (all),partial-word and then substring completion
-zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+if [ "x$CASE_SENSITIVE" = "xtrue" ]; then
+ zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+ unset CASE_SENSITIVE
+else
+ zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+fi
zstyle ':completion:*' list-colors ''
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
@@ -37,4 +42,4 @@ zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/
# zstyle ':completion:*:history-words' stop yes
# zstyle ':completion:*:history-words' remove-all-dups yes
# zstyle ':completion:*:history-words' list false
-# zstyle ':completion:*:history-words' menu yes \ No newline at end of file
+# zstyle ':completion:*:history-words' menu yes
diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template
index 787dc3d09..7c43303bd 100644
--- a/templates/zshrc.zsh-template
+++ b/templates/zshrc.zsh-template
@@ -5,6 +5,9 @@ export ZSH=$HOME/.oh-my-zsh
# Look in ~/.oh-my-zsh/themes/
export ZSH_THEME="robbyrussell"
+# Set to this to use case-sensitive completion
+# export CASE_SENSITIVE="true"
+
# Comment this out to disable weekly auto-update checks
# export DISABLE_AUTO_UPDATE="false"