aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/descr-text.el2
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 @@
12013-05-09 Ulrich Mueller <ulm@gentoo.org>
2
3 * descr-text.el (describe-char): Fix %d/%x typo. (Bug#14360)
4
12013-05-09 Glenn Morris <rgm@gnu.org> 52013-05-09 Glenn Morris <rgm@gnu.org>
2 6
3 * international/fontset.el (vertical-centering-font-regexp): 7 * 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."
753 (insert " by these characters:\n") 753 (insert " by these characters:\n")
754 (while (and (<= from to) 754 (while (and (<= from to)
755 (setq glyph (lgstring-glyph gstring from))) 755 (setq glyph (lgstring-glyph gstring from)))
756 (insert (format " %c (#x%d)\n" 756 (insert (format " %c (#x%x)\n"
757 (lglyph-char glyph) (lglyph-char glyph))) 757 (lglyph-char glyph) (lglyph-char glyph)))
758 (setq from (1+ from))))) 758 (setq from (1+ from)))))
759 (insert " by the rule:\n\t(") 759 (insert " by the rule:\n\t(")