* src/editfns.c (Fformat): Correctly handle text properties on "%%".

diff --git a/src/ChangeLog b/src/ChangeLog
index 22f69d4a9bb41e54a8ff6272bfd810a574b4246c..2fb4780508290e5f4a9ea0670db6f6cad37ea5f4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-15  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * editfns.c (Fformat): Correctly handle text properties on "%%".
+
 2011-09-15  Eli Zaretskii  <eliz@gnu.org>
 
        * xterm.c (x_draw_composite_glyph_string_foreground):

diff --git a/src/editfns.c b/src/editfns.c
index f62efc30790b7e878256caeb1783f6c3316f6a4a..fb9ef7a5b9f5b6e5a9732afdfe9ab757bc50ca7d 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3721,7 +3721,11 @@ usage: (format STRING &rest OBJECTS)  */)
          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 @@ usage: (format STRING &rest OBJECTS)  */)
              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
            {