From 92f2cf94adfd811157fcd981a42274dcdf392d04 Mon Sep 17 00:00:00 2001 From: Matthew Donoughe Date: Wed, 7 Oct 2009 20:01:52 +0000 Subject: [PATCH 1/5] allow case sensitivity to be toggled --- lib/completion.zsh | 7 ++++++- templates/zshrc.zsh-template | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/completion.zsh b/lib/completion.zsh index 795903d..11f6724 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 [ "$CASE_SENSITIVE" ]; 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 ) diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 787dc3d..7c43303 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" From a44b5660bf4b76c9b1d56a3805f22417e6370ced Mon Sep 17 00:00:00 2001 From: Matthew Donoughe Date: Wed, 7 Oct 2009 20:08:54 +0000 Subject: [PATCH 2/5] should probably use the value of CASE_INSENSITIVE --- lib/completion.zsh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/completion.zsh b/lib/completion.zsh index 11f6724..68ca3b4 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -14,7 +14,7 @@ compinit zmodload -i zsh/complist ## case-insensitive (all),partial-word and then substring completion -if [ "$CASE_SENSITIVE" ]; then +if [ "x$CASE_SENSITIVE" = "xtrue" ]; then zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' unset CASE_SENSITIVE else @@ -42,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 From 0b724396e3443d67de44aa9ef4ac2f160d027315 Mon Sep 17 00:00:00 2001 From: Robby Russell Date: Mon, 26 Oct 2009 09:09:00 -0700 Subject: [PATCH 3/5] Merging conflict. 788c9af05684f4b9e39e7f15de2c06c4c8291cbd --- lib/aliases.zsh | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 304bafd..69f2eee 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -55,6 +55,3 @@ alias et='mate . &' alias ett='mate app config lib db public spec test Rakefile Capfile Todo &' alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' - - - From f706f53c7c63ab1d77c9bbf7c88f447ba2f3a5bf Mon Sep 17 00:00:00 2001 From: Gerhard Lazu Date: Mon, 12 Oct 2009 07:56:55 +0100 Subject: [PATCH 4/5] ll doesn't show hidden files, lsa does --- lib/aliases.zsh | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index 69f2eee..d340c08 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -39,6 +39,7 @@ alias gcp='git cherry-pick' alias history='fc -l 1' alias ls='ls -F' +alias lsa='ls -lah' alias ll='ls -alr' alias l='ls' alias ll='ls -l' From 136df77b17e81760c6b20cb9d5ef5ccba075545c Mon Sep 17 00:00:00 2001 From: Gerhard Lazu Date: Wed, 14 Oct 2009 14:12:17 +0100 Subject: [PATCH 5/5] lsa now uses coloring --- lib/aliases.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/aliases.zsh b/lib/aliases.zsh index d340c08..855dfeb 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -39,7 +39,7 @@ alias gcp='git cherry-pick' alias history='fc -l 1' alias ls='ls -F' -alias lsa='ls -lah' +alias lsa='ls -lahG' alias ll='ls -alr' alias l='ls' alias ll='ls -l'