Commit cf7edc2a authored by Andreas Schwab's avatar Andreas Schwab
Browse files

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

parent bd01620e
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):
......
......@@ -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
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment