mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

(what-cursor-position): If the character is displayed

Browse Source 
by some `display' text property, show that.  Don't use
single-key-description for eight-bit characters in multibyte mode.
This commit is contained in:
Kenichi Handa 2005-10-06 06:57:41 +00:00
parent 475a41c957
commit a41b50cadd
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -1,3 +1,9 @@
2005-10-06 Kenichi Handa <handa@m17n.org>
* simple.el (what-cursor-position): If the character is displayed
by some `display' text property, show that. Don't use
single-key-description for eight-bit characters in multibyte mode.
2005-10-06 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-fringe-width): New variable.

46
lisp/simple.el
View File

@ -896,22 +896,42 @@ in *Help* buffer. See also the command `describe-char'."
(message "point=%d of %d (%d%%) column %d %s"
pos total percent col hscroll))
(let ((coding buffer-file-coding-system)
encoded encoding-msg)
encoded encoding-msg display-prop under-display)
(if (or (not coding)
(eq (coding-system-type coding) t))
(setq coding default-buffer-file-coding-system))
(if (not (char-valid-p char))
(setq encoding-msg
(format "(0%o, %d, 0x%x, invalid)" char char char))
(setq encoded (and (>= char 128) (encode-coding-char char coding)))
;; Check if the character is displayed with some `display'
;; text property. In that case, set under-display to the
;; buffer substring covered by that property.
(setq display-prop (get-text-property pos 'display))
(if display-prop
(let ((to (or (next-single-property-change pos 'display)
(point-max))))
(if (< to (+ pos 4))
(setq under-display "")
(setq under-display "..."
to (+ pos 4)))
(setq under-display
(concat (buffer-substring-no-properties pos to)
under-display)))
(setq encoded (and (>= char 128) (encode-coding-char char coding))))
(setq encoding-msg
(if encoded
(format "(0%o, %d, 0x%x, file %s)"
char char char
(if (> (length encoded) 1)
"..."
(encoded-string-description encoded coding)))
(format "(0%o, %d, 0x%x)" char char char))))
(if display-prop
(if (not (stringp display-prop))
(format "(0%o, %d, 0x%x, part of display \"%s\")"
char char char under-display)
(format "(0%o, %d, 0x%x, part of display \"%s\"->\"%s\")"
char char char under-display display-prop))
(if encoded
(format "(0%o, %d, 0x%x, file %s)"
char char char
(if (> (length encoded) 1)
"..."
(encoded-string-description encoded coding)))
(format "(0%o, %d, 0x%x)" char char char)))))
(if detail
;; We show the detailed information about CHAR.
(describe-char (point)))
@ -922,9 +942,11 @@ in *Help* buffer. See also the command `describe-char'."
(buffer-substring-no-properties (point) (1+ (point))))
encoding-msg pos total percent beg end col hscroll)
(message "Char: %s %s point=%d of %d (%d%%) column %d %s"
(if (< char 256)
(single-key-description char)
(buffer-substring-no-properties (point) (1+ (point))))
(if enable-multibyte-characters
(if (< char 128)
(single-key-description char)
(buffer-substring-no-properties (point) (1+ (point))))
(single-key-description char))
encoding-msg pos total percent col hscroll))))))
(defvar read-expression-map