[Emacs-diffs] Changes to emacs/src/editfns.c

[Kenichi Handa]

Index: emacs/src/editfns.c
diff -c emacs/src/editfns.c:1.347 emacs/src/editfns.c:1.348
*** emacs/src/editfns.c:1.347   Sat Dec 21 13:00:23 2002
--- emacs/src/editfns.c Thu Jan 16 19:47:58 2003
***************
*** 3359,3375 ****
                error ("Invalid format operation %%%c", *format);
  
            thissize = 30;
!           if (*format == 'c'
!               && (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
!                   || XINT (args[n]) == 0))
              {
!               if (! multibyte)
                  {
!                   multibyte = 1;
!                   goto retry;
                  }
-               args[n] = Fchar_to_string (args[n]);
-               thissize = SBYTES (args[n]);
              }
          }
        else if (FLOATP (args[n]) && *format != 's')
--- 3359,3383 ----
                error ("Invalid format operation %%%c", *format);
  
            thissize = 30;
!           if (*format == 'c')
              {
!               if (! SINGLE_BYTE_CHAR_P (XINT (args[n]))
!                   || XINT (args[n]) == 0)
                  {
!                   if (! multibyte)
!                     {
!                       multibyte = 1;
!                       goto retry;
!                     }
!                   args[n] = Fchar_to_string (args[n]);
!                   thissize = SBYTES (args[n]);
!                 }
!               else if (! ASCII_BYTE_P (XINT (args[n])) && multibyte)
!                 {
!                   args[n]
!                     = Fchar_to_string (Funibyte_char_to_multibyte (args[n]));
!                   thissize = SBYTES (args[n]);
                  }
              }
          }
        else if (FLOATP (args[n]) && *format != 's')