(Fformat): Handle %c specially since it requires the

argument to be of type int.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7b3fc9bb8338e2bac6de5aa1aee73bc0470a283e..3527506b20a82dc992784f7aa623dc6be6e2ea34 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-23  Andreas Schwab  <schwab@suse.de>
+
+       * editfns.c (Fformat): Handle %c specially since it requires the
+       argument to be of type int.
+
 2007-11-23  Markus Triska  <markus.triska@gmx.at>
 
        * emacs.c (main): Call init_editfns before init_process, since

diff --git a/src/editfns.c b/src/editfns.c
index 008cc3a95bf1cbefa904d0db5cf7b591952c4db1..f5b71f2aa1826750e0f84a5bf7bc99cb453f8563 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3807,7 +3807,8 @@ usage: (format STRING &rest OBJECTS)  */)
                sprintf (p, this_format, XFLOAT_DATA (args[n]));
              else
                {
-                 if (sizeof (EMACS_INT) > sizeof (int))
+                 if (sizeof (EMACS_INT) > sizeof (int)
+                     && format[-1] != 'c')
                    {
                      /* Insert 'l' before format spec.  */
                      this_format[format - this_format_start]
@@ -3816,21 +3817,25 @@ usage: (format STRING &rest OBJECTS)  */)
                      this_format[format - this_format_start + 1] = 0;
                    }
 
-               if (INTEGERP (args[n]))
-                 {
-                   if (format[-1] == 'd')
-                     sprintf (p, this_format, XINT (args[n]));
+                 if (INTEGERP (args[n]))
+                   {
+                     if (format[-1] == 'c')
+                       sprintf (p, this_format, (int) XINT (args[n]));
+                     else if (format[-1] == 'd')
+                       sprintf (p, this_format, XINT (args[n]));
+                     /* Don't sign-extend for octal or hex printing.  */
+                     else
+                       sprintf (p, this_format, XUINT (args[n]));
+                   }
+                 else if (format[-1] == 'c')
+                   sprintf (p, this_format, (int) XFLOAT_DATA (args[n]));
+                 else if (format[-1] == 'd')
+                   /* Maybe we should use "%1.0f" instead so it also works
+                      for values larger than MAXINT.  */
+                   sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
+                 else
                    /* Don't sign-extend for octal or hex printing.  */
-                   else
-                     sprintf (p, this_format, XUINT (args[n]));
-                 }
-               else if (format[-1] == 'd')
-                 /* Maybe we should use "%1.0f" instead so it also works
-                    for values larger than MAXINT.  */
-                 sprintf (p, this_format, (EMACS_INT) XFLOAT_DATA (args[n]));
-               else
-                 /* Don't sign-extend for octal or hex printing.  */
-                 sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
+                   sprintf (p, this_format, (EMACS_UINT) XFLOAT_DATA (args[n]));
                }
 
              if (p > buf