aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2011-04-10 11:02:59 -0700
committerPaul Eggert2011-04-10 11:02:59 -0700
commit785bbd422461295890087ced24bfd87504032d0c (patch)
treea07c7a57741781beebe0d61e65269ddeb1d3ba09 /src
parentb2ded58d7e0eb75f00071036d1c07bbd55313b60 (diff)
downloademacs-785bbd422461295890087ced24bfd87504032d0c.tar.gz
emacs-785bbd422461295890087ced24bfd87504032d0c.zip
* editfns.c (Fformat): Remove unreachable code.
2011-04-10 Paul Eggert <eggert@cs.ucla.edu>
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c8
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 @@
12011-04-10 Paul Eggert <eggert@cs.ucla.edu> 12011-04-10 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * editfns.c (Fformat): Remove unreachable code.
4
52011-04-10 Paul Eggert <eggert@cs.ucla.edu>
6
3 Fix more problems found by GCC 4.6.0's static checks. 7 Fix more problems found by GCC 4.6.0's static checks.
4 8
5 * xdisp.c (vmessage): Use a better test for character truncation. 9 * 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) */)
3802 if (*format == 'c') 3802 if (*format == 'c')
3803 { 3803 {
3804 if (! ASCII_CHAR_P (XINT (args[n])) 3804 if (! ASCII_CHAR_P (XINT (args[n]))
3805 /* Note: No one can remeber why we have to treat 3805 /* Note: No one can remember why we have to treat
3806 the character 0 as a multibyte character here. 3806 the character 0 as a multibyte character here.
3807 But, until it causes a real problem, let's 3807 But, until it causes a real problem, let's
3808 don't change it. */ 3808 don't change it. */
@@ -3816,12 +3816,6 @@ usage: (format STRING &rest OBJECTS) */)
3816 args[n] = Fchar_to_string (args[n]); 3816 args[n] = Fchar_to_string (args[n]);
3817 thissize = SBYTES (args[n]); 3817 thissize = SBYTES (args[n]);
3818 } 3818 }
3819 else if (! ASCII_BYTE_P (XINT (args[n])) && multibyte)
3820 {
3821 args[n]
3822 = Fchar_to_string (Funibyte_char_to_multibyte (args[n]));
3823 thissize = SBYTES (args[n]);
3824 }
3825 } 3819 }
3826 } 3820 }
3827 else if (FLOATP (args[n]) && *format != 's') 3821 else if (FLOATP (args[n]) && *format != 's')