diff options
7 files changed, 0 insertions, 178 deletions
diff --git a/debian/patches/cherry-pick-771381c2-fix-$((...))-completion-in-expand-or-complete-widget.patch b/debian/patches/cherry-pick-771381c2-fix-$((...))-completion-in-expand-or-complete-widget.patch deleted file mode 100644 index c3257486d..000000000 --- a/debian/patches/cherry-pick-771381c2-fix-$((...))-completion-in-expand-or-complete-widget.patch +++ /dev/null @@ -1,32 +0,0 @@ -Description: 35908: fix $((...)) completion in expand-or-complete widget -Origin: commit 771381c2ce0587d825528d49244006edf770fd47 -Author: Peter Stephenson <p.w.stephenson@ntlworld.com> -Bug-Debian: https://bugs.debian.org/793168 - -Index: zsh/Src/Zle/zle_tricky.c -=================================================================== ---- zsh.orig/Src/Zle/zle_tricky.c 2015-07-26 19:50:33.237182978 +0200 -+++ zsh/Src/Zle/zle_tricky.c 2015-07-26 19:50:33.237182978 +0200 -@@ -730,11 +730,12 @@ - } - } - } -- if (lst == COMP_EXPAND_COMPLETE) -+ if (lst == COMP_EXPAND_COMPLETE) { - do { - /* Check if there is a parameter expression. */ - for (; *q && *q != String; q++); -- if (*q == String && q[1] != Inpar && q[1] != Inbrack) { -+ if (*q == String && q[1] != Inpar && q[1] != Inparmath && -+ q[1] != Inbrack) { - if (*++q == Inbrace) { - if (! skipparens(Inbrace, Outbrace, &q) && - q == s + zlemetacs - wb) -@@ -778,6 +779,7 @@ - } else - break; - } while (q < s + zlemetacs - wb); -+ } - if (lst == COMP_EXPAND_COMPLETE) { - /* If it is still not clear if we should use expansion or * - * completion and there is a `$' or a backtick in the word, * 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 deleted file mode 100644 index be81279f0..000000000 --- a/debian/patches/cherry-pick-7bc47c91-prompt_adam1_setup-fix-perl-5.22-warnings.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 7bc47c91e92cc6642e6dd416c4f94fb22bc6309c -Author: Barton E. Schaefer <schaefer@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/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch b/debian/patches/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch deleted file mode 100644 index 3d61927cb..000000000 --- a/debian/patches/cherry-pick-811027a2-fix-signal-queueing-in-zcontext_save_partial-790282.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit 811027a22a806f753537abee1575da8714d3fa0a -Author: Barton E. Schaefer <schaefer@zsh.org> -Date: Sat Jun 27 15:53:21 2015 -0700 -Bug-Debian: https://bugs.debian.org/790282 - - 35642: signal queueing in zcontext_save_partial() - -diff --git a/Src/context.c b/Src/context.c -index 1b8741f..2dc8d3b 100644 ---- a/Src/context.c -+++ b/Src/context.c -@@ -53,6 +53,8 @@ zcontext_save_partial(int parts) - { - struct context_stack *cs; - -+ queue_signals(); -+ - cs = (struct context_stack *)malloc(sizeof(struct context_stack)); - - if (parts & ZCONTEXT_HIST) { -@@ -67,6 +69,8 @@ zcontext_save_partial(int parts) - - cs->next = cstack; - cstack = cs; -+ -+ unqueue_signals(); - } - - /* save context in full */ diff --git a/debian/patches/cherry-pick-b3aa3b77-dont-add-to-raw-lex-buffer-if-lex-stopped.patch b/debian/patches/cherry-pick-b3aa3b77-dont-add-to-raw-lex-buffer-if-lex-stopped.patch deleted file mode 100644 index ac691372f..000000000 --- a/debian/patches/cherry-pick-b3aa3b77-dont-add-to-raw-lex-buffer-if-lex-stopped.patch +++ /dev/null @@ -1,21 +0,0 @@ -Origin: commit b3aa3b77916007703b341bfd30c3647bdc355bc8 -Author: Peter Stephenson <p.w.stephenson@ntlworld.com> -Description: 35910: Don't add to raw lex buffer if lex stopped. - This was causing a segmentation violation in completion when parsing - an incomplete math expression, e.g. 'echo $((3*4)<TAB>'. -Acked-By: Axel Beckert <abe@debian.org> - -diff --git a/Src/input.c b/Src/input.c -index 613f89a..1efabad 100644 ---- a/Src/input.c -+++ b/Src/input.c -@@ -222,7 +222,8 @@ ingetc(void) - if (inputline()) - break; - } -- zshlex_raw_add(lastc); -+ if (!lexstop) -+ zshlex_raw_add(lastc); - return lastc; - } - diff --git a/debian/patches/cherry-pick-dd8079e0-fix-$((...))-completion-by-_expand-widget.patch b/debian/patches/cherry-pick-dd8079e0-fix-$((...))-completion-by-_expand-widget.patch deleted file mode 100644 index 39fc4c9fb..000000000 --- a/debian/patches/cherry-pick-dd8079e0-fix-$((...))-completion-by-_expand-widget.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: 35809: fix $((...)) completion by _expand widget. - This changes internal quoting of the form still including tokens - not to add unnecessary internal backslashes. -Origin: commit dd8079e0415cf213d9bb5d41d1ad95c04b774f3a -Author: Peter Stephenson <p.w.stephenson@ntlworld.com> -Bug-Debian: https://bugs.debian.org/793168 - -Index: zsh/Src/utils.c -=================================================================== ---- zsh.orig/Src/utils.c 2015-07-26 19:50:39.037207942 +0200 -+++ zsh/Src/utils.c 2015-07-26 19:50:39.037207942 +0200 -@@ -5301,7 +5301,25 @@ - /* Needs to be passed straight through. */ - if (dobackslash) - *v++ = '\\'; -- *v++ = *u++; -+ if (*u == Inparmath) { -+ /* -+ * Already syntactically quoted: don't -+ * add more. -+ */ -+ int inmath = 1; -+ *v++ = *u++; -+ for (;;) { -+ char uc = *u; -+ *v++ = *u++; -+ if (uc == '\0') -+ break; -+ else if (uc == Outparmath && !--inmath) -+ break; -+ else if (uc == Inparmath) -+ ++inmath; -+ } -+ } else -+ *v++ = *u++; - continue; - } - diff --git a/debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch b/debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch deleted file mode 100644 index 37bc9cd6c..000000000 --- a/debian/patches/cherry-pick-ef080283-handle-failure-of-gettempname-in-namedpipe.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ef080283468cbd7b46ceb19c148cd0b9c4d52356 -Author: Barton E. Schaefer <schaefer@zsh.org> -Date: Sat Jun 27 12:50:40 2015 -0700 - - 35634: handle failure of gettempname() in namedpipe() - -diff --git a/Src/exec.c b/Src/exec.c -index 50a11eb..39d1326 100644 ---- a/Src/exec.c -+++ b/Src/exec.c -@@ -4133,6 +4133,10 @@ namedpipe(void) - { - char *tnam = gettempname(NULL, 1); - -+ if (!tnam) { -+ zerr("failed to create named pipe: %e", errno); -+ return NULL; -+ } - # ifdef HAVE_MKFIFO - if (mkfifo(tnam, 0600) < 0){ - # else diff --git a/debian/patches/series b/debian/patches/series index 9bc19df7f..857f0f26d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1 @@ 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 -cherry-pick-771381c2-fix-$((...))-completion-in-expand-or-complete-widget.patch -cherry-pick-dd8079e0-fix-$((...))-completion-by-_expand-widget.patch -cherry-pick-b3aa3b77-dont-add-to-raw-lex-buffer-if-lex-stopped.patch |