summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/git.zsh2
-rw-r--r--lib/grep.zsh2
-rw-r--r--lib/misc.zsh4
3 files changed, 6 insertions, 2 deletions
diff --git a/lib/git.zsh b/lib/git.zsh
index baf863717..1e203c7c6 100644
--- a/lib/git.zsh
+++ b/lib/git.zsh
@@ -38,7 +38,7 @@ git_remote_status() {
if [ $ahead -eq 0 ] && [ $behind -eq 0 ]
then
- echo "$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
+ git_remote_status="$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE"
elif [ $ahead -gt 0 ] && [ $behind -eq 0 ]
then
git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE"
diff --git a/lib/grep.zsh b/lib/grep.zsh
index 3fa103d19..abc1650a1 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -11,7 +11,7 @@ if grep-flag-available --color=auto; then
fi
# ignore VCS folders (if the necessary grep flags are available)
-VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
+VCS_FOLDERS="{.bzr,CVS,.git,.hg,.svn}"
if grep-flag-available --exclude-dir=.cvs; then
GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS"
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 6d1a64e8d..bdb884046 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,6 +1,10 @@
## Load smart urls if available
for d in $fpath; do
if [[ -e "$d/url-quote-magic" ]]; then
+ if [[ -e "$d/bracketed-paste-magic" ]]; then
+ autoload -Uz bracketed-paste-magic
+ zle -N bracketed-paste bracketed-paste-magic
+ fi
autoload -U url-quote-magic
zle -N self-insert url-quote-magic
fi