From b4a198cdda3d499af4e2b4f4a2279f98c8d07433 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@zsh.org>
Date: Fri, 5 Dec 2014 17:06:28 +0000
Subject: 33859: Fix traps in completion

We need to use a function-style trap in order for the effect of the
interrupt to propagate back correctly.
---
 Completion/Base/Core/_main_complete | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'Completion/Base/Core')

diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete
index fcd63664e..91b68fe5d 100644
--- a/Completion/Base/Core/_main_complete
+++ b/Completion/Base/Core/_main_complete
@@ -128,8 +128,11 @@ _completer_num=1
 
 # We assume localtraps to be in effect here ...
 integer SECONDS=0
-trap 'zle -M "Killed by signal in ${funcstack[1]} after ${SECONDS}s";
-      zle -R; return 130' INT QUIT
+TRAPINT TRAPQUIT() {
+  zle -M "Killed by signal in ${funcstack[1]} after ${SECONDS}s";
+  zle -R
+  return 130
+}
 
 # Call the pre-functions.
 
-- 
cgit 1.4.1