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

diff --git a/src/ChangeLog b/src/ChangeLog
index f42395977c9b6514e87b55dd165610d44d2d4538..44d922a254e5f896463c0ce2bc170061c0324f6d 100644 (file)
--- 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 0b71d10515596175e70e5835ba96781954687ff7..a636c35a4643565114a8c9e20c55374bd05000f4 100644 (file)
--- 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;