From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28242 invoked from network); 21 Sep 2006 16:11:34 -0000 X-Spam-Checker-Version: SpamAssassin 3.1.5 (2006-08-29) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00, FORGED_RCVD_HELO autolearn=ham version=3.1.5 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 21 Sep 2006 16:11:34 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 19567 invoked from network); 21 Sep 2006 16:11:27 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 21 Sep 2006 16:11:27 -0000 Received: (qmail 3774 invoked by alias); 21 Sep 2006 16:11:25 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 22753 Received: (qmail 3765 invoked from network); 21 Sep 2006 16:11:24 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 21 Sep 2006 16:11:24 -0000 Received: (qmail 19285 invoked from network); 21 Sep 2006 16:11:24 -0000 Received: from cluster-d.mailcontrol.com (217.69.20.190) by a.mx.sunsite.dk with SMTP; 21 Sep 2006 16:11:19 -0000 Received: from cameurexb01.EUROPE.ROOT.PRI ([62.189.241.200]) by rly19d.srv.mailcontrol.com (MailControl) with ESMTP id k8LGB8tv015929 for ; Thu, 21 Sep 2006 17:11:16 +0100 Received: from news01.csr.com ([10.103.143.38]) by cameurexb01.EUROPE.ROOT.PRI with Microsoft SMTPSVC(6.0.3790.1830); Thu, 21 Sep 2006 17:08:12 +0100 Received: from news01.csr.com (localhost.localdomain [127.0.0.1]) by news01.csr.com (8.13.7/8.13.4) with ESMTP id k8LG8B5D007610 for ; Thu, 21 Sep 2006 17:08:11 +0100 Received: from csr.com (pws@localhost) by news01.csr.com (8.13.7/8.13.7/Submit) with ESMTP id k8LG8B16007607 for ; Thu, 21 Sep 2006 17:08:11 +0100 Message-Id: <200609211608.k8LG8B16007607@news01.csr.com> X-Authentication-Warning: news01.csr.com: pws owned process doing -bs To: zsh-workers@sunsite.dk (Zsh hackers list) Subject: PATCH: minor character tweaks Date: Thu, 21 Sep 2006 17:08:11 +0100 From: Peter Stephenson X-OriginalArrivalTime: 21 Sep 2006 16:08:12.0208 (UTC) FILETIME=[2334FB00:01C6DD98] Content-Type: text/plain MIME-Version: 1.0 X-Scanned-By: MailControl A-07-04-01 (www.mailcontrol.com) on 10.68.0.129 A few things that turned from a compilation under Cygwin, which produced some different warnings. Index: Src/prompt.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/prompt.c,v retrieving revision 1.41 diff -u -r1.41 prompt.c --- Src/prompt.c 15 Sep 2006 13:17:27 -0000 1.41 +++ Src/prompt.c 21 Sep 2006 16:05:38 -0000 @@ -1130,7 +1130,8 @@ * Normal text: build up a multibyte character. */ char inchar; - wchar_t cc, wcw; + wchar_t cc; + int wcw; /* * careful: string is still metafied (we Index: Src/utils.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/utils.c,v retrieving revision 1.138 diff -u -r1.138 utils.c --- Src/utils.c 15 Sep 2006 13:17:27 -0000 1.138 +++ Src/utils.c 21 Sep 2006 16:05:40 -0000 @@ -2019,9 +2019,10 @@ noquery(int purge) { int val = 0; - char c; #ifdef FIONREAD + char c; + ioctl(SHTTY, FIONREAD, (char *)&val); if (purge) { for (; val; val--) Index: Src/Zle/complist.c =================================================================== RCS file: /cvsroot/zsh/zsh/Src/Zle/complist.c,v retrieving revision 1.95 diff -u -r1.95 complist.c --- Src/Zle/complist.c 20 Aug 2006 22:28:17 -0000 1.95 +++ Src/Zle/complist.c 21 Sep 2006 16:05:41 -0000 @@ -982,7 +982,7 @@ len = MB_METACHARLENCONV(p, &cchar); #ifdef MULTIBYTE_SUPPORT if (cchar == WEOF) { - cchar = (wchar_t)p; + cchar = (wchar_t)(*p == Meta ? p[1] ^ 32 : *p); width = 1; } else @@ -995,7 +995,7 @@ len = MB_METACHARLENCONV(p, &cchar); #ifdef MULTIBYTE_SUPPORT if (cchar == WEOF) - cchar = (wchar_t)p; + cchar = (wchar_t)(*p == Meta ? p[1] ^ 32 : *p); #endif p += len; -- Peter Stephenson Software Engineer CSR PLC, Churchill House, Cambridge Business Park, Cowley Road Cambridge, CB4 0WZ, UK Tel: +44 (0)1223 692070 To access the latest news from CSR copy this link into a web browser: http://www.csr.com/email_sig.php