aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2008-08-04 12:01:54 +0000
committerJuanma Barranquero2008-08-04 12:01:54 +0000
commit96065fcef228a062dbadf5f65384a7d1303c06be (patch)
treee242d9dae747aa0555340ebcf6a567823b0dc6e6
parent9d5a559375309727d199fa5b8a4b5f9b9e4b7050 (diff)
downloademacs-96065fcef228a062dbadf5f65384a7d1303c06be.tar.gz
emacs-96065fcef228a062dbadf5f65384a7d1303c06be.zip
* descr-text.el (describe-char-display): Fix last change:
don't pass CHARSET to `encoded-string-description'.
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/descr-text.el2
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 859ae3f799d..76eec12223c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-08-04 Juanma Barranquero <lekktu@gmail.com>
2
3 * descr-text.el (describe-char-display): Fix last change:
4 don't pass CHARSET to `encoded-string-description'.
5
12008-08-02 Alex Harsanyi <harsanyi@mac.com> (tiny change) 62008-08-02 Alex Harsanyi <harsanyi@mac.com> (tiny change)
2 7
3 * vc.el (vc-next-action): Update list var correctly after delete. 8 * vc.el (vc-next-action): Update list var correctly after delete.
@@ -14,7 +19,7 @@
14 19
152008-08-02 Jason Rumney <jasonr@gnu.org> 202008-08-02 Jason Rumney <jasonr@gnu.org>
16 21
17 * w32-fns.el (tis620-2533): Use as preferred registry for thai fonts. 22 * w32-fns.el (tis620-2533): Use as preferred registry for thai fonts.
18 23
192008-08-01 Kenichi Handa <handa@m17n.org> 242008-08-01 Kenichi Handa <handa@m17n.org>
20 25
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index d509cb5d5b6..13f97303783 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -345,7 +345,7 @@ This function is semi-obsolete. Use `get-char-code-property'."
345 (coding (terminal-coding-system)) 345 (coding (terminal-coding-system))
346 (encoded (encode-coding-char char coding charset))) 346 (encoded (encode-coding-char char coding charset)))
347 (if encoded 347 (if encoded
348 (encoded-string-description encoded coding charset))))) 348 (encoded-string-description encoded coding)))))
349 349
350 350
351;; Return a string of CH with composition for padding on both sides. 351;; Return a string of CH with composition for padding on both sides.