Commit f0d16a7f authored by Kenichi Handa's avatar Kenichi Handa

(what-cursor-position): Show "(composed)" if the

character is composed.
parent 9d4d60c1
...@@ -513,33 +513,26 @@ addition, the encoding is fully shown." ...@@ -513,33 +513,26 @@ addition, the encoding is fully shown."
"..." "..."
(concat (concat
(encoded-string-description encoded coding) (encoded-string-description encoded coding)
(if (cmpcharp char) "..." "")))) (if (nth 2 (find-composition (point)))
" (composed)" ""))))
(format "(0%o, %d, 0x%x)" char char char)))) (format "(0%o, %d, 0x%x)" char char char))))
(if detail (if detail
;; We show the detailed information of CHAR. ;; We show the detailed information of CHAR.
(let ((internal (message "Char: %s %s %s"
(if (cmpcharp char) (if (< char 256)
;; For a composite character, we show the (single-key-description char)
;; components only. (buffer-substring-no-properties (point) (1+ (point))))
(concat "(composed \"" encoding-msg (split-char char))
(decompose-composite-char char)
"\")")
(split-char char))))
(message "Char: %s %s %s"
(if (< char 256)
(single-key-description char)
(buffer-substring (point) (1+ (point))))
encoding-msg internal))
(if (or (/= beg 1) (/= end (1+ total))) (if (or (/= beg 1) (/= end (1+ total)))
(message "Char: %s %s point=%d of %d(%d%%) <%d - %d> column %d %s" (message "Char: %s %s point=%d of %d(%d%%) <%d - %d> column %d %s"
(if (< char 256) (if (< char 256)
(single-key-description char) (single-key-description char)
(buffer-substring (point) (1+ (point)))) (buffer-substring-no-properties (point) (1+ (point))))
encoding-msg pos total percent beg end col hscroll) encoding-msg pos total percent beg end col hscroll)
(message "Char: %s %s point=%d of %d(%d%%) column %d %s" (message "Char: %s %s point=%d of %d(%d%%) column %d %s"
(if (< char 256) (if (< char 256)
(single-key-description char) (single-key-description char)
(buffer-substring (point) (1+ (point)))) (buffer-substring-no-properties (point) (1+ (point))))
encoding-msg pos total percent col hscroll))))))) encoding-msg pos total percent col hscroll)))))))
(defvar read-expression-map (cons 'keymap minibuffer-local-map) (defvar read-expression-map (cons 'keymap minibuffer-local-map)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment