summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2018-07-23 10:23:35 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2018-07-23 10:24:24 -0700
commit90256285e107641b064d6ec51a9c5bb03c3eee6a (patch)
tree48205b8d61a4ac46a26ee57d5b13973609b10d0c
parent57c4bc146b7e17b6f662604047cb5d10982f962c (diff)
downloademacs-90256285e107641b064d6ec51a9c5bb03c3eee6a.tar.gz
(format "%#x" 0) yields "0", not "0x0"
* doc/lispref/strings.texi (Formatting Strings): * src/editfns.c (Fformat): Document this.
-rw-r--r--doc/lispref/strings.texi2
-rw-r--r--src/editfns.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index f68199e9f98..2fff3c7c75c 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -1025,7 +1025,7 @@ both flags are used, @samp{+} takes precedence.
The flag @samp{#} specifies an alternate form which depends on
the format in use. For @samp{%o}, it ensures that the result begins
-with a @samp{0}. For @samp{%x} and @samp{%X}, it prefixes the result
+with a @samp{0}. For @samp{%x} and @samp{%X}, it prefixes nonzero results
with @samp{0x} or @samp{0X}. For @samp{%e} and @samp{%f}, the
@samp{#} flag means include a decimal point even if the precision is
zero. For @samp{%g}, it always includes a decimal point, and also
diff --git a/src/editfns.c b/src/editfns.c
index ccc0d27b139..09f836c3eb4 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -4202,7 +4202,7 @@ The - and 0 flags affect the width specifier, as described below.
The # flag means to use an alternate display form for %o, %x, %X, %e,
%f, and %g sequences: for %o, it ensures that the result begins with
-\"0\"; for %x and %X, it prefixes the result with \"0x\" or \"0X\";
+\"0\"; for %x and %X, it prefixes nonzero results with \"0x\" or \"0X\";
for %e and %f, it causes a decimal point to be included even if the
precision is zero; for %g, it causes a decimal point to be
included even if the precision is zero, and also forces trailing