[Pkg-zsh-commits] [zsh] 02/02: Cherry-pick upstream fix to avoid warnings in prompt adam1 with Perl 5.22

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch debian
in repository zsh.

commit 724f974ff5b881ac6cf06c51162e7e6445354f30
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Mon Jun 29 21:18:08 2015 +0200

    Cherry-pick upstream fix to avoid warnings in prompt adam1 with Perl 5.22
---
 ...prompt_adam1_setup-fix-perl-5.22-warnings.patch | 31 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/cherry-pick-7bc47c91-prompt_adam1_setup-fix-perl-5.22-warnings.patch b/debian/patches/cherry-pick-7bc47c91-prompt_adam1_setup-fix-perl-5.22-warnings.patch
new file mode 100644
index 0000000..be81279
--- /dev/null
+++ b/debian/patches/cherry-pick-7bc47c91-prompt_adam1_setup-fix-perl-5.22-warnings.patch
@@ -0,0 +1,31 @@
+commit 7bc47c91e92cc6642e6dd416c4f94fb22bc6309c
+Author: Barton E. Schaefer <schaefer at zsh.org>
+Date:   Sun Jun 28 20:19:04 2015 -0700
+
+    35660: prompt_adam1_setup: avoid perl, fix help
+
+diff --git a/Functions/Prompts/prompt_adam1_setup b/Functions/Prompts/prompt_adam1_setup
+index 034641f..aca0e59 100644
+--- a/Functions/Prompts/prompt_adam1_setup
++++ b/Functions/Prompts/prompt_adam1_setup
+@@ -14,8 +14,6 @@ This theme works best with a dark background.
+ Recommended fonts for this theme: nexus or vga or similar.  If you
+ don't have any of these, then specify the `plain' option to use 7-bit
+ replacements for the 8-bit characters.
+-
+-And you probably thought adam1 was overkill.
+ EOF
+ }
+ 
+@@ -27,8 +25,9 @@ prompt_adam1_setup () {
+   base_prompt="%K{$prompt_adam1_color1}%n@%m%k "
+   post_prompt="%b%f%k"
+ 
+-  base_prompt_no_color=$(echo "$base_prompt" | perl -pe "s/%(K{.*?}|k)//g")
+-  post_prompt_no_color=$(echo "$post_prompt" | perl -pe "s/%(K{.*?}|k)//g")
++  setopt localoptions extendedglob
++  base_prompt_no_color="${base_prompt//(%K{[^\\\}]#\}|%k)/}"
++  post_prompt_no_color="${post_prompt//(%K{[^\\\}]#\}|%k)/}"
+ 
+   add-zsh-hook precmd prompt_adam1_precmd
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 6d0d852..ff6dd92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 further-mitigate-test-suite-hangs.patch
 cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch
 cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch
+cherry-pick-7bc47c91-prompt_adam1_setup-fix-perl-5.22-warnings.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/zsh.git