From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5105 invoked from network); 10 Aug 2005 11:58:09 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 10 Aug 2005 11:58:09 -0000 Received: (qmail 78024 invoked from network); 10 Aug 2005 11:58:03 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 10 Aug 2005 11:58:03 -0000 Received: (qmail 21205 invoked by alias); 10 Aug 2005 11:58:00 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 21592 Received: (qmail 21191 invoked from network); 10 Aug 2005 11:58:00 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 10 Aug 2005 11:58:00 -0000 Received: (qmail 77727 invoked from network); 10 Aug 2005 11:58:00 -0000 Received: from mailhost1.csr.com (HELO MAILSWEEPER01.csr.com) (81.105.217.43) by a.mx.sunsite.dk with SMTP; 10 Aug 2005 11:57:55 -0000 Received: from exchange03.csr.com (unverified [10.100.137.60]) by MAILSWEEPER01.csr.com (Content Technologies SMTPRS 4.3.12) with ESMTP id for ; Wed, 10 Aug 2005 12:55:46 +0100 Received: from news01.csr.com ([10.103.143.38]) by exchange03.csr.com with Microsoft SMTPSVC(5.0.2195.6713); Wed, 10 Aug 2005 12:57:42 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.13.1/8.12.11) with ESMTP id j7ABvrxr017872 for ; Wed, 10 Aug 2005 12:57:53 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.13.1/8.13.1/Submit) with ESMTP id j7ABvrck017869 for ; Wed, 10 Aug 2005 12:57:53 +0100 Message-Id: <200508101157.j7ABvrck017869@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: fix 1, was Re: unpatch: metafying zle line In-reply-to: <200508101034.j7AAYISV013947@news01.csr.com> References: <200508101034.j7AAYISV013947@news01.csr.com> Date: Wed, 10 Aug 2005 12:57:52 +0100 From: Peter Stephenson X-OriginalArrivalTime: 10 Aug 2005 11:57:42.0195 (UTC) FILETIME=[B67EC030:01C59DA2] X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.4 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 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. **********************************************************************