[Emacs-diffs] /srv/bzr/emacs/trunk r104506: Fixes: debbugs:8806

[Andreas Schwab]

------------------------------------------------------------
revno: 104506
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2011-06-06 00:46:26 +0200
message:
  Fixes: debbugs:8806
  
  * src/editfns.c (Fformat): Correctly handle zero flag with hexadecimal
  format.
modified:
  src/ChangeLog
  src/editfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-06-05 22:20:42 +0000
+++ b/src/ChangeLog     2011-06-05 22:46:26 +0000
@@ -1,5 +1,8 @@
 2011-06-05  Andreas Schwab  <address@hidden>
 
+       * editfns.c (Fformat): Correctly handle zero flag with hexadecimal
+       format.  (Bug#8806)
+
        * gtkutil.c (xg_get_default_scrollbar_width): Avoid warning.
 
        * xfns.c (x_set_scroll_bar_default_width): Move declarations

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2011-05-30 16:47:35 +0000
+++ b/src/editfns.c     2011-06-05 22:46:26 +0000
@@ -4083,7 +4083,10 @@
                  int exponent_bytes = 0;
                  int signedp = src0 == '-' || src0 == '+' || src0 == ' ';
                  int significand_bytes;
-                 if (zero_flag && '0' <= src[signedp] && src[signedp] <= '9')
+                 if (zero_flag
+                     && ((src[signedp] >= '0' && src[signedp] <= '9')
+                         || (src[signedp] >= 'a' && src[signedp] <= 'f')
+                         || (src[signedp] >= 'A' && src[signedp] <= 'F')))
                    {
                      leading_zeros += padding;
                      padding = 0;