Re: zsh exits after delete-char-or-list and two ^Cs

[Peter Stephenson <pws@csr.com>]

Bart Schaefer wrote:
> There also appears to be a bug in 4.2.x with "zle -I" and "zle -R".  This 
> should work:
> 
> 	TRAPINT() { zle -I && zle send-break }
> 
> because "zle -I" is supposed to return zero only when zle is active. 
> However, I get:
> 
> 	TRAPINT:zle: widgets can only be called when ZLE is active

The first problem is that zle -I doesn't have the same test as zle
<widget>.  It's reasonable that it should.

The second problem is that the test currently includes the function
context.  In this case, we've been called from a trap.  I'm not
convinced this test is necessary; I think it should work as long as
zleactive is set, so that we are in a nested context.  So I've removed
that test.  If there are cases where this is problematic, they should be
fixed up separately.

Actually, the context could be SFC_COMPLETE or SFC_CWIDGET for old- and
new-style completion functions, in which case we don't want to allow
normal zle widgets.  However, I think in this case the existing tests
for incompctlfunc and incompfunc are good enough.  A simple test seems
to indicate they are.

It still doesn't work as you expect, since you get the normal effect of
^C as well as the effect of the send-break.  I'm not convinced that's a
bug, yet.

Index: Doc/Zsh/zle.yo
===================================================================
RCS file: /cvsroot/zsh/zsh/Doc/Zsh/zle.yo,v
retrieving revision 1.39
diff -u -r1.39 zle.yo
--- Doc/Zsh/zle.yo	29 Jul 2004 14:22:21 -0000	1.39
+++ Doc/Zsh/zle.yo	1 Sep 2004 18:02:00 -0000
@@ -507,7 +507,8 @@
 
 The status is zero if zle is active and the current zle display has
 been invalidated (even if this was by a previous call to `tt(zle -I)'),
-else one.
+else one.  More precisely, the status is zero if zle is currently in a
+usable state, i.e. a zle widget can be called immediately.
 )
 item(var(widget) tt([ -n) var(num) tt(]) tt([ -N ]) var(args) ...)(
 Invoke the specified widget.  This can only be done when ZLE is
Index: Src/Zle/zle_thingy.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_thingy.c,v
retrieving revision 1.13
diff -u -r1.13 zle_thingy.c
--- Src/Zle/zle_thingy.c	2 Jun 2004 22:15:02 -0000	1.13
+++ Src/Zle/zle_thingy.c	1 Sep 2004 18:02:02 -0000
@@ -619,6 +619,23 @@
 
 /**/
 static int
+zle_usable()
+{
+    return zleactive && !incompctlfunc && !incompfunc
+#if 0
+	/*
+	 * PWS experiment: commenting this out allows zle widgets
+	 * in signals, hooks etc.  I'm not sure if this has a down side;
+	 * it ought to be that zleactive is good enough to test whether
+	 * widgets are callable.
+	 */
+	&& sfcontext == SFC_WIDGET
+#endif
+	   ;
+}
+
+/**/
+static int
 bin_zle_call(char *name, char **args, UNUSED(Options ops), UNUSED(char func))
 {
     Thingy t;
@@ -629,10 +646,9 @@
     if (!wname) {
 	if (saveflag)
 	    zmod = modsave;
-	return (!zleactive || incompctlfunc || incompfunc ||
-		sfcontext != SFC_WIDGET);
+	return !zle_usable();
     }
-    if(!zleactive || incompctlfunc || incompfunc || sfcontext != SFC_WIDGET) {
+    if(!zle_usable()) {
 	zwarnnam(name, "widgets can only be called when ZLE is active",
 	    NULL, 0);
 	return 1;
@@ -685,7 +701,7 @@
 static int
 bin_zle_invalidate(UNUSED(char *name), UNUSED(char **args), UNUSED(Options ops), UNUSED(char func))
 {
-    if (zleactive) {
+    if (zle_usable()) {
 	if (!trashedzle)
 	    trashzle();
 	return 0;

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR Ltd., Science Park, Milton Road,
Cambridge, CB4 0WH, UK                          Tel: +44 (0)1223 692070


**********************************************************************
This email and any files transmitted with it are confidential and
intended solely for the use of the individual or entity to whom they
are addressed. If you have received this email in error please notify
the system manager.

This footnote also confirms that this email message has been swept by
MIMEsweeper for the presence of computer viruses.

www.mimesweeper.com
**********************************************************************