(Fmessage): Revert last change to properly handle %% format.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3a81632c84405935ac6cb7988ec0edb39f636811..4feabdd5d7bf761902575ca9e232dddcfa15f1da 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-01  Andreas Schwab  <schwab@suse.de>
+
+       * editfns.c (Fmessage): Revert last change to properly handle %%
+       format.
+
 2002-11-01  Stefan Monnier  <monnier@cs.yale.edu>
 
        * xmenu.c (unuse_menu_items): New fun.

diff --git a/src/editfns.c b/src/editfns.c
index 57c96ff78448f32f9f23fb96780539c88e7d681c..7fb203c854becbfd1727534f12a666db31561bb6 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3027,7 +3027,7 @@ usage: (message STRING &rest ARGS)  */)
   else
     {
       register Lisp_Object val;
-      val = nargs < 2 && STRINGP (args[0]) ? args[0] : Fformat (nargs, args);
+      val = Fformat (nargs, args);
       message3 (val, SBYTES (val), STRING_MULTIBYTE (val));
       return val;
     }