From b7aecf6c8ee6beb028f4f3f7548c1b899fc5bfae Mon Sep 17 00:00:00 2001
From: Peter Stephenson
Date: Sat, 27 Jun 2015 17:50:57 +0100
Subject: Don't require MULTI_FUNCDEF in _main_complete. Although it gets set
there, _main_complete is parsed to the end first.
---
ChangeLog | 4 ++++
Completion/Base/Core/_main_complete | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 7785619c5..0f03b1b4a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2015-06-27 Peter Stephenson
+ * users/20281: Completion/Base/Core/_main_complete:
+ don't require MULTIFUNCDEF as _main_complete is parsed
+ before we can ensure it's set.
+
* 35623: Src/builtin.c, Src/zsh.h, Test/B02typeset.ztst: 35610
was incomplete: all is_array asignments should be treated as
having a value.
diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete
index c023268b3..9c4cfac85 100644
--- a/Completion/Base/Core/_main_complete
+++ b/Completion/Base/Core/_main_complete
@@ -141,11 +141,16 @@ _completer_num=1
# We assume localtraps to be in effect here ...
integer SECONDS=0
-TRAPINT TRAPQUIT() {
+TRAPINT() {
zle -M "Killed by signal in ${funcstack[2]} after ${SECONDS}s";
zle -R
return 130
}
+TRAPQUIT() {
+ zle -M "Killed by signal in ${funcstack[2]} after ${SECONDS}s";
+ zle -R
+ return 131
+}
# Call the pre-functions.
--
cgit 1.4.1