Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org

2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4b67d34b56..5bbfe1a6ff7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-09  Ulrich Mueller  <ulm@gentoo.org>
+
+        * descr-text.el (describe-char): Fix %d/%x typo.  (Bug#14360)
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
         * international/fontset.el (vertical-centering-font-regexp):
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 2aea0a96215..774ee92a146 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -753,7 +753,7 @@ relevant to POS."
                     (insert " by these characters:\n")
                     (while (and (<= from to)
                                 (setq glyph (lgstring-glyph gstring from)))
-                      (insert (format " %c (#x%d)\n"
+                      (insert (format " %c (#x%x)\n"
                                       (lglyph-char glyph) (lglyph-char glyph)))
                       (setq from (1+ from)))))
               (insert " by the rule:\n\t(")