Mercurial > emacs

changeset 89715:dbdc71c3c9f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(describe-char): Check `charset' property. Show the code point in the charset in hexadigits.
author Kenichi Handa <handa@m17n.org>
date Fri, 16 Jan 2004 00:35:16 +0000
parents f370abd24fea
children ae8be7325b11
files lisp/descr-text.el
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/descr-text.el	Thu Jan 15 23:04:06 2004 +0000
+++ b/lisp/descr-text.el	Fri Jan 16 00:35:16 2004 +0000
@@ -446,13 +446,15 @@
   (if (>= pos (point-max))
       (error "No character follows specified position"))
   (let* ((char (char-after pos))
-	 (charset (char-charset char))
+	 (charset (get-char-property pos 'charset))
 	 (buffer (current-buffer))
 	 (composition (find-composition pos nil nil t))
 	 (composed (if composition (buffer-substring (car composition)
 						     (nth 1 composition))))
 	 (multibyte-p enable-multibyte-characters)
-	 item-list max-width)
+	 code item-list max-width)
+    (or (and (charsetp charset) (encode-char char charset))
+	(setq charset (char-charset char)))
     (if (eq charset 'eight-bit)
 	(setq item-list
 	      `(("character"
@@ -460,6 +462,7 @@
 			  (char-to-string char) char char char
 			  (multibyte-char-to-unibyte char)))))
 
+      (setq code (encode-char char charset))
       (setq item-list
 	    `(("character"
 	       ,(format "%s (0%o, %d, 0x%x)" (if (< char 256)
@@ -470,8 +473,7 @@
 	       ,(symbol-name charset)
 	       ,(format "(%s)" (charset-description charset)))
 	      ("code point"
- 	       ,(let ((split (split-char char)))
-		  (mapconcat #'number-to-string (cdr split) " ")))
+ 	       ,(format (if (< code 256) "0x%02X" "0x%04X") code))
 	      ("syntax"
  	       ,(let ((syntax (syntax-after pos)))
 		  (with-temp-buffer