PATCH: fix 1, was Re: unpatch: metafying zle line

[Peter Stephenson <pws@xxxxxxx>]

Peter Stephenson wrote:
> I have a patch for the first step in making completion work with wide
> characters.  It's quite long, so instead of posting a patch which will
> fill people's mailboxes and no one will read I'll describe it here and
> commit it some time during the day.

It's committed.  Here's the first bug: accept-and-infer-next-history in
menu selection gets the metafication state confused.  (That function is
probably the most confused with regard to the state, see the comment
further up.)

Index: Src/Zle/complist.c
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Zle/complist.c,v
retrieving revision 1.69
diff -u -r1.69 complist.c
--- Src/Zle/complist.c	10 Aug 2005 10:56:41 -0000	1.69
+++ Src/Zle/complist.c	10 Aug 2005 11:55:11 -0000
@@ -2303,7 +2303,10 @@
                 iforcemenu = -1;
             } else
                 mode = 0;
+	    /* Nested completion assumes line is unmetafied */
+	    unmetafy_line();
 	    menucomplete(zlenoargs);
+	    metafy_line();
 	    iforcemenu = 0;
 
             if (cmd != Th(z_acceptandinfernexthistory))

-- 
Peter Stephenson <pws@xxxxxxx>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, 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.

**********************************************************************