diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 8 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6d300875518..58df7e08955 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2011-04-10 Paul Eggert <eggert@cs.ucla.edu> + * editfns.c (Fformat): Remove unreachable code. + +2011-04-10 Paul Eggert <eggert@cs.ucla.edu> + Fix more problems found by GCC 4.6.0's static checks. * xdisp.c (vmessage): Use a better test for character truncation. diff --git a/src/editfns.c b/src/editfns.c index e754a074ba8..85b30de6975 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -3802,7 +3802,7 @@ usage: (format STRING &rest OBJECTS) */) if (*format == 'c') { if (! ASCII_CHAR_P (XINT (args[n])) - /* Note: No one can remeber why we have to treat + /* Note: No one can remember why we have to treat the character 0 as a multibyte character here. But, until it causes a real problem, let's don't change it. */ @@ -3816,12 +3816,6 @@ usage: (format STRING &rest OBJECTS) */) args[n] = Fchar_to_string (args[n]); thissize = SBYTES (args[n]); } - else if (! ASCII_BYTE_P (XINT (args[n])) && multibyte) - { - args[n] - = Fchar_to_string (Funibyte_char_to_multibyte (args[n])); - thissize = SBYTES (args[n]); - } } } else if (FLOATP (args[n]) && *format != 's') |