From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15789 invoked from network); 10 Aug 2005 13:19:26 -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 13:19:26 -0000 Received: (qmail 43927 invoked from network); 10 Aug 2005 13:19:19 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 10 Aug 2005 13:19:19 -0000 Received: (qmail 10014 invoked by alias); 10 Aug 2005 13:19:16 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 21593 Received: (qmail 10005 invoked from network); 10 Aug 2005 13:19:15 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 10 Aug 2005 13:19:15 -0000 Received: (qmail 43531 invoked from network); 10 Aug 2005 13:19:15 -0000 Received: from mailhost1.csr.com (HELO MAILSWEEPER01.csr.com) (81.105.217.43) by a.mx.sunsite.dk with SMTP; 10 Aug 2005 13:19:10 -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 14:17:00 +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 14:18:56 +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 j7ADJ8oi002068 for ; Wed, 10 Aug 2005 14:19:08 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.13.1/8.13.1/Submit) with ESMTP id j7ADJ6mx002062 for ; Wed, 10 Aug 2005 14:19:06 +0100 Message-Id: <200508101319.j7ADJ6mx002062@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 2, was Re: unpatch: metafying zle line In-reply-to: <200508101157.j7ABvrck017869@news01.csr.com> References: <200508101034.j7AAYISV013947@news01.csr.com> <200508101157.j7ABvrck017869@news01.csr.com> Date: Wed, 10 Aug 2005 14:19:04 +0100 From: Peter Stephenson X-OriginalArrivalTime: 10 Aug 2005 13:18:56.0877 (UTC) FILETIME=[100831D0:01C59DAE] 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 Remove two problems with character arrays with ZLE_UNICODE_SUPPORT by transferring a "*" from one file to another. Very economical. Index: Src/Zle/complist.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Zle/complist.c,v retrieving revision 1.70 diff -u -r1.70 complist.c --- Src/Zle/complist.c 10 Aug 2005 11:59:29 -0000 1.70 +++ Src/Zle/complist.c 10 Aug 2005 13:15:52 -0000 @@ -1865,7 +1865,7 @@ { #ifdef ZLE_UNICODE_SUPPORT /* MB_CUR_MAX may not be constant */ - VARARR(char *, s, MB_CUR_MAX+1); + VARARR(char, s, MB_CUR_MAX+1); #else char s[2]; #endif Index: Src/Zle/zle_refresh.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Zle/zle_refresh.c,v retrieving revision 1.24 diff -u -r1.24 zle_refresh.c --- Src/Zle/zle_refresh.c 10 Aug 2005 10:56:41 -0000 1.24 +++ Src/Zle/zle_refresh.c 10 Aug 2005 13:15:52 -0000 @@ -1207,7 +1207,7 @@ #ifdef ZLE_UNICODE_SUPPORT ZLE_STRING_T lpwbuf, lpwp; /* converted lprompt and pointer */ char *lpptr, /* pointer into multibyte lprompt */ - lpend; /* end of multibyte lprompt */ + *lpend; /* end of multibyte lprompt */ mbstate_t ps; /* shift state */ #endif -- 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. **********************************************************************