summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2015-10-20 08:26:15 +0200
committerMarc Cornellà <marc.cornella@live.com>2015-10-20 08:26:15 +0200
commit56345c26fbabd2ca01c67b258139153a1368ef32 (patch)
tree5104901aa9f3b6f6717e7c1faf1b0c7bb50c3126 /lib
parentaa15ebad3e9c86fbd8dd5f01803066f82ece9593 (diff)
parent35517457921c095be1aa6ed948debfbe183b89ac (diff)
downloadzsh-56345c26fbabd2ca01c67b258139153a1368ef32.tar.gz
zsh-56345c26fbabd2ca01c67b258139153a1368ef32.tar.bz2
zsh-56345c26fbabd2ca01c67b258139153a1368ef32.zip
Merge pull request #4473 from apjanke/5_1_1-bracketed-paste-hack
Disable bracketed-paste-magic in zsh 5.1.1, where it is buggy
Diffstat (limited to 'lib')
-rw-r--r--lib/misc.zsh28
1 files changed, 16 insertions, 12 deletions
diff --git a/lib/misc.zsh b/lib/misc.zsh
index 8ff076e77..c81dab413 100644
--- a/lib/misc.zsh
+++ b/lib/misc.zsh
@@ -1,14 +1,19 @@
## 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
-done
+# bracketed-paste-magic is known buggy in zsh 5.1.1 (only), so skip it there; see #4434
+autoload -Uz is-at-least
+if [[ $ZSH_VERSION != 5.1.1 ]]; then
+ for d in $fpath; do
+ if [[ -e "$d/url-quote-magic" ]]; then
+ if is-at-least 5.1; then
+ autoload -Uz bracketed-paste-magic
+ zle -N bracketed-paste bracketed-paste-magic
+ fi
+ autoload -Uz url-quote-magic
+ zle -N self-insert url-quote-magic
+ break
+ fi
+ done
+fi
## jobs
setopt long_list_jobs
@@ -22,8 +27,7 @@ alias _='sudo'
alias please='sudo'
## more intelligent acking for ubuntu users
-if which ack-grep &> /dev/null;
-then
+if which ack-grep &> /dev/null; then
alias afind='ack-grep -il'
else
alias afind='ack -il'