universal argument regression

universal argument regression

[Vin Shelton]

Greetings -

While empirically determing if copy-prev-word followed the universal
prefix (see my posting to zsh-users), I came across a regression in
the current shell vs. 4.2.1.

xterm -e zsh-4.2.1 -f

  asdfg^A<ESC>4^F

does what is expected - it moves the cursor from the 'a' to the 'g'.

xterm -e zsh-2005-11-01 -f

  asdfg^A<ESC>4^F

doesn't behave in the same way.  ^A moves to the 'a', but then <ESC>4
flashes the screen (and is ignored) and the ^F moves forward 1
character to the 's'.  It looks like the universal prefix argument is
ignored in the latest CVS sources.

(Upon further testing, this regression is fairly recent - a version of
the shell build on 2005-10-01 does not exhibit this bug.  HTH.)


Regards,
  Vin

Re: universal argument regression

[Peter Stephenson]

Vin Shelton <acs@alumni.princeton.edu> wrote:
> It looks like the universal prefix argument is
> ignored in the latest CVS sources.

This wasn't hard to spot when I started looking...

Index: Src/Zle/zle_misc.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_misc.c,v
retrieving revision 1.31
diff -u -r1.31 zle_misc.c
--- Src/Zle/zle_misc.c	1 Nov 2005 03:26:52 -0000	1.31
+++ Src/Zle/zle_misc.c	2 Nov 2005 10:07:07 -0000
@@ -532,11 +532,11 @@
      * of digits.  We are assuming ASCII is a subset of the multibyte
      * encoding.
      */
-    if (idigit(lastchar))
+    if (!idigit(lastchar))
 	return 1;
 #else
     /* allow metafied as well as ordinary digits */
-    if (idigit(lastchar & 0x7f))
+    if (!idigit(lastchar & 0x7f))
 	return 1;
 #endif
 


-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


This message has been scanned for viruses by BlackSpider MailControl - www.blackspider.com

Re: universal argument regression

[Vin Shelton]

Peter Stephenson <pws@csr.com> writes:

> Vin Shelton <acs@alumni.princeton.edu> wrote:
>> It looks like the universal prefix argument is
>> ignored in the latest CVS sources.
>
> This wasn't hard to spot when I started looking...
>
> Index: Src/Zle/zle_misc.c
> ===================================================================
> RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_misc.c,v
> retrieving revision 1.31
> diff -u -r1.31 zle_misc.c
> --- Src/Zle/zle_misc.c	1 Nov 2005 03:26:52 -0000	1.31
> +++ Src/Zle/zle_misc.c	2 Nov 2005 10:07:07 -0000
> @@ -532,11 +532,11 @@
>       * of digits.  We are assuming ASCII is a subset of the multibyte
>       * encoding.
>       */
> -    if (idigit(lastchar))
> +    if (!idigit(lastchar))
>  	return 1;
>  #else
>      /* allow metafied as well as ordinary digits */
> -    if (idigit(lastchar & 0x7f))
> +    if (!idigit(lastchar & 0x7f))
>  	return 1;
>  #endif
>  

Yup, that fixed it.

Thank you, Peter.

  - vin