diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2011-09-15 18:56:07 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2011-09-15 18:56:07 +0200 |
| commit | cf7edc2a6ea95e0acc574c5364bf6f729b53e492 (patch) | |
| tree | 43eeddaa5b56e0c967262a9fda6b4cb75de3b0cb /src/editfns.c | |
| parent | bd01620e014a5638cc9e157003778607046a0562 (diff) | |
* src/editfns.c (Fformat): Correctly handle text properties on "%%".
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/editfns.c b/src/editfns.c index f62efc3079..fb9ef7a5b9 100644 --- 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 { |