* editfns.c (Fformat): Fix bug in text-property fix (Bug#9514).

Don't mishandle (length (format "%%")) and (format "%4000s%%" "").

diff --git a/src/ChangeLog b/src/ChangeLog
index b89fe55ec3028739ec91a013420eba1ec97d2f1a..15281f474387032ec2a5572716bedb60d6f6bcf9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-15  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * editfns.c (Fformat): Fix bug in text-property fix (Bug#9514).
+       Don't mishandle (length (format "%%")) and (format "%4000s%%" "").
+
 2011-09-15  Andreas Schwab  <schwab@linux-m68k.org>
 
        * editfns.c (Fformat): Correctly handle text properties on "%%".

diff --git a/src/editfns.c b/src/editfns.c
index fb9ef7a5b9f5b6e5a9732afdfe9ab757bc50ca7d..3dd58377ada1c5d4d3f1a28c326eb1f4cb1d51d3 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3721,11 +3721,7 @@ usage: (format STRING &rest OBJECTS)  */)
          memset (&discarded[format0 - format_start], 1, format - format0);
          conversion = *format;
          if (conversion == '%')
-           {
-             format0++;
-             nchars++;
-             goto copy_char;
-           }
+           goto copy_char;
          discarded[format - format_start] = 1;
          format++;
 
@@ -4142,7 +4138,7 @@ usage: (format STRING &rest OBJECTS)  */)
              while (! CHAR_HEAD_P (*format));
 
              convbytes = format - src;
-             memset (&discarded[format0 + 1 - format_start], 2, convbytes - 1);
+             memset (&discarded[src + 1 - format_start], 2, convbytes - 1);
            }
          else
            {