[Emacs-diffs] /srv/bzr/emacs/trunk r105788: * src/editfns.c (Fformat): Correctly handle text properties on "%%".

[Andreas Schwab]

------------------------------------------------------------
revno: 105788
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Thu 2011-09-15 18:56:07 +0200
message:
  * src/editfns.c (Fformat): Correctly handle text properties on "%%".
modified:
  src/ChangeLog
  src/editfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-15 16:22:58 +0000
+++ b/src/ChangeLog     2011-09-15 16:56:07 +0000
@@ -1,3 +1,7 @@
+2011-09-15  Andreas Schwab  <address@hidden>
+
+       * editfns.c (Fformat): Correctly handle text properties on "%%".
+
 2011-09-15  Eli Zaretskii  <address@hidden>
 
        * xterm.c (x_draw_composite_glyph_string_foreground):

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2011-09-15 16:10:37 +0000
+++ b/src/editfns.c     2011-09-15 16:56:07 +0000
@@ -3721,7 +3721,11 @@
          memset (&discarded[format0 - format_start], 1, format - format0);
          conversion = *format;
          if (conversion == '%')
-           goto copy_char;
+           {
+             format0++;
+             nchars++;
+             goto copy_char;
+           }
          discarded[format - format_start] = 1;
          format++;
 
@@ -4138,8 +4142,7 @@
              while (! CHAR_HEAD_P (*format));
 
              convbytes = format - src;
-             memset (&discarded[format0 + 1 - format_start], 2,
-                     format - (format0 + 1));
+             memset (&discarded[format0 + 1 - format_start], 2, convbytes - 1);
            }
          else
            {