zsh-4.3.9 compilation fails with multibyte disabled

zsh-4.3.9 compilation fails with multibyte disabled

[Thomas Köhler]

[-- Attachment #1: Type: text/plain, Size: 1288 bytes --]

Hello all,
the compiler complains because the int now_off is not declared at
the beginning of a block. As I don't know if someone else already
discovered this, here's a patch. Just ignore if it is already
fixed :-)

~/zsh/zsh-4.3.9> diff -u Src/Zle/zle_refresh.c.ORG Src/Zle/zle_refresh.c
--- Src/Zle/zle_refresh.c.ORG   Wed Nov  4 13:54:32 2009
+++ Src/Zle/zle_refresh.c       Wed Nov  4 14:02:01 2009
@@ -2044,8 +2044,9 @@
 	 */
 	if (!nl->chr)
 	    break;
-	do {
+	do
 #endif
+	{
 	    /*
 	     * If an attribute was on here but isn't any more,
 	     * output the sequence to turn it off.
@@ -2057,12 +2058,13 @@
 	    zputc(nl);
 	    nl++, ol++;
 	    ccs++, vcs++;
+	}
 #ifdef MULTIBYTE_SUPPORT
 	    /*
 	     * Make sure we always overwrite the complete width of
 	     * a character that was there before.
 	     */
-	} while ((ol->chr == WEOF && nl->chr) ||
+	while ((ol->chr == WEOF && nl->chr) ||
 		  (nl->chr == WEOF && ol->chr));
 #endif
     }
~/zsh/zsh-4.3.9> 

Bye,
Thomas

-- 
 Thomas Köhler       Email:       jean-luc@picard.franken.de
     <><             WWW:              http://gott-gehabt.de
                     IRC:                           tkoehler
                     PGP public key available from Homepage!

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

Re: zsh-4.3.9 compilation fails with multibyte disabled

[Peter Stephenson]

Thomas =?iso-8859-1?Q?K=F6hler?= wrote:
> the compiler complains because the int now_off is not declared at
> the beginning of a block. As I don't know if someone else already
> discovered this, here's a patch. Just ignore if it is already
> fixed :-)

We now declare now_off up higher, so it's fixed a slightly different
way.

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


Member of the CSR plc group of companies. CSR plc registered in England and Wales, registered number 4187346, registered office Churchill House, Cambridge Business Park, Cowley Road, Cambridge, CB4 0WZ, United Kingdom