diff options
| author | Paul Eggert <[email protected]> | 2011-09-15 11:11:37 -0700 |
|---|---|---|
| committer | Paul Eggert <[email protected]> | 2011-09-15 11:11:37 -0700 |
| commit | 7812ba2dea75097980bb6371381385b417479c74 (patch) | |
| tree | a38b0b64682184f3ea6de8aac7b83406fe7a4a6d /src | |
| parent | 4c12272509481fd87428364a102fc1ac73c1e275 (diff) | |
* editfns.c (Fformat): Fix bug in text-property fix (Bug#9514).
Don't mishandle (length (format "%%")) and (format "%4000s%%" "").
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/editfns.c | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b89fe55ec3..15281f4743 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-09-15 Paul Eggert <[email protected]> + + * editfns.c (Fformat): Fix bug in text-property fix (Bug#9514). + Don't mishandle (length (format "%%")) and (format "%4000s%%" ""). + 2011-09-15 Andreas Schwab <[email protected]> * editfns.c (Fformat): Correctly handle text properties on "%%". diff --git a/src/editfns.c b/src/editfns.c index fb9ef7a5b9..3dd58377ad 100644 --- 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 { |