From: Bart Schaefer <schaefer@brasslantern.com>
To: "Zsh Hackers' List" <zsh-workers@zsh.org>
Subject: Re: Interrupting globs (Re: Something rotten in tar completion)
Date: Sat, 06 Dec 2014 21:59:11 -0800 [thread overview]
Message-ID: <141206215911.ZM16010@torch.brasslantern.com> (raw)
In-Reply-To: <20141205203417.2bc66b7b@pws-pc.ntlworld.com>
(Note, two competing patches herein, do not apply both.)
On Dec 5, 8:34pm, Peter Stephenson wrote:
}
} The trap goes back to zsh-workers/32322 (it got modified later but that
} was largely cosmetic). The rationale there, it appears, was it was
} making difficulties in interrupting easier to test (by displaying the
} message, I presume) --- not that it was fixing anything. So as far as I
} can see the underlying complaint was the same as mine, to return the
} shell to the point where I get control of the command line as soon as
} possible. Am I missing something?
No, I'd forgotten the exact circumstances. However, as I mentioned in
another part of the thread, there's something I missed as well, which
is that if you ^C all the way out of _main_complete, some interesting
(if not always important) bits of state don't get restored.
If we stick with the TRAPINT(), then we need this ...
diff --git a/Completion/Base/Core/_main_complete b/Completion/Base/Core/_main_complete
index 91b68fe..bc63e83 100644
--- a/Completion/Base/Core/_main_complete
+++ b/Completion/Base/Core/_main_complete
@@ -129,7 +129,7 @@ _completer_num=1
# We assume localtraps to be in effect here ...
integer SECONDS=0
TRAPINT TRAPQUIT() {
- zle -M "Killed by signal in ${funcstack[1]} after ${SECONDS}s";
+ zle -M "Killed by signal in ${funcstack[2]} after ${SECONDS}s";
zle -R
return 130
}
... and we also need an always-block or something to cover cleanup,
which may mean rearranging other parts of _main_complete.
Or we could do this, which stops the matcher-list and completer loops
(and any tag loops or the like that are also in play) and then does
the rest of _main_complete as usual:
diff --git a/Completion/Base/Core/_main_complete
b/Completion/Base/Core/_main_complete
index 91b68fe..5c4e368 100644
--- a/Completion/Base/Core/_main_complete
+++ b/Completion/Base/Core/_main_complete
@@ -126,13 +126,14 @@ fi
_completer_num=1
-# We assume localtraps to be in effect here ...
-integer SECONDS=0
-TRAPINT TRAPQUIT() {
+# We assume localtraps and no_localloops to be in effect here ...
+float SECONDS=0
+trap '
zle -M "Killed by signal in ${funcstack[1]} after ${SECONDS}s";
zle -R
+ repeat 1 break 10000 # break out of any reasonable number of loops
return 130
-}
+' INT QUIT
# Call the pre-functions.
next prev parent reply other threads:[~2014-12-07 5:59 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-02 15:54 Something rotten in tar completion Peter Stephenson
2014-12-02 16:48 ` Bart Schaefer
2014-12-02 17:26 ` Peter Stephenson
2014-12-04 16:56 ` Bart Schaefer
2014-12-04 17:12 ` Peter Stephenson
2014-12-05 8:20 ` Interrupting globs (Re: Something rotten in tar completion) Bart Schaefer
2014-12-05 14:17 ` Jérémie Roquet
2014-12-06 21:50 ` Bart Schaefer
2014-12-06 22:15 ` Bart Schaefer
2014-12-05 14:50 ` Peter Stephenson
2014-12-05 15:14 ` Jérémie Roquet
[not found] ` <22084.1417791853@thecus.kiddle.eu>
2014-12-05 15:29 ` Peter Stephenson
2014-12-05 17:03 ` Peter Stephenson
2014-12-05 17:53 ` Peter Stephenson
2014-12-05 18:06 ` Bart Schaefer
2014-12-05 18:13 ` Peter Stephenson
2014-12-05 20:34 ` Peter Stephenson
2014-12-05 22:07 ` Peter Stephenson
2014-12-06 0:32 ` Ray Andrews
2014-12-06 22:27 ` Bart Schaefer
2014-12-06 22:57 ` Ray Andrews
2014-12-06 0:36 ` Mikael Magnusson
2014-12-06 0:40 ` Mikael Magnusson
2014-12-06 22:31 ` Bart Schaefer
2014-12-06 0:52 ` Mikael Magnusson
2014-12-06 11:49 ` Mikael Magnusson
2014-12-06 17:48 ` Bart Schaefer
2014-12-07 1:42 ` Mikael Magnusson
2014-12-07 4:45 ` Bart Schaefer
2014-12-07 5:04 ` Bart Schaefer
2014-12-07 17:39 ` Peter Stephenson
2014-12-07 22:59 ` Mikael Magnusson
2014-12-07 5:18 ` Bart Schaefer
2014-12-07 17:07 ` Peter Stephenson
2014-12-07 17:19 ` Peter Stephenson
2014-12-08 11:18 ` Peter Stephenson
2014-12-08 12:43 ` Mikael Magnusson
2014-12-08 13:03 ` Peter Stephenson
2014-12-08 15:51 ` Mikael Magnusson
2014-12-08 16:41 ` Bart Schaefer
2014-12-07 17:37 ` Oliver Kiddle
2014-12-07 18:18 ` Peter Stephenson
2014-12-07 18:34 ` Bart Schaefer
2014-12-07 18:59 ` Peter Stephenson
2014-12-07 19:58 ` Bart Schaefer
2014-12-08 10:01 ` Peter Stephenson
2014-12-07 20:20 ` Peter Stephenson
2014-12-07 20:54 ` Bart Schaefer
2014-12-07 20:03 ` Peter Stephenson
2014-12-07 5:59 ` Bart Schaefer [this message]
2014-12-07 7:15 ` Mikael Magnusson
2014-12-07 16:21 ` Peter Stephenson
2014-12-07 23:01 ` Interrupts in completion, traps in _main_complete Bart Schaefer
2014-12-08 20:27 ` Peter Stephenson
2014-12-09 4:43 ` Bart Schaefer
2014-12-09 11:26 ` Peter Stephenson
2014-12-09 11:50 ` Peter Stephenson
2014-12-09 21:09 ` Peter Stephenson
2014-12-10 10:02 ` interrupt_abort incorporation Peter Stephenson
2014-12-11 10:00 ` Peter Stephenson
2014-12-04 17:24 ` Something rotten in tar completion Bart Schaefer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=141206215911.ZM16010@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).