From: Kenichi Handa <handa@m17n.org>
Date: Thu, 8 Jan 2004 08:40:12 +0000 (+0000)
Subject: (Fformat): Fix '&' to '&&'.
X-Git-Tag: ttn-vms-21-2-B4~7970
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3a9f36e6345fb62fb47b831850384b28ae81f4a3;p=emacs.git

(Fformat): Fix '&' to '&&'.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index f42395977c9..44d922a254e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-08  Kenichi Handa  <handa@m17n.org>
+
+	* editfns.c (Fformat): Fix '&' to '&&'.
+
 2004-01-08  Andreas Schwab  <schwab@suse.de>
 
 	* print.c (print_preprocess) <case Lisp_Vectorlike>: Only mask
diff --git a/src/editfns.c b/src/editfns.c
index 0b71d105155..a636c35a464 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3447,7 +3447,7 @@ usage: (format STRING &rest OBJECTS)  */)
 	    /* Anything but a string, convert to a string using princ.  */
 	    register Lisp_Object tem;
 	    tem = Fprin1_to_string (args[n], Qt);
-	    if (STRING_MULTIBYTE (tem) & ! multibyte)
+	    if (STRING_MULTIBYTE (tem) && ! multibyte)
 	      {
 		multibyte = 1;
 		goto retry;