aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2005-11-20 07:43:01 +0000
committerJuri Linkov2005-11-20 07:43:01 +0000
commita17a79c039afccab013dda5dbeae43f546a7c4a1 (patch)
treec8e31a6982b292bbad78ee0c92ee8e9ad86eab0d
parentcee723fbf90394a695e87ef9348d2907aa1cac65 (diff)
downloademacs-a17a79c039afccab013dda5dbeae43f546a7c4a1.tar.gz
emacs-a17a79c039afccab013dda5dbeae43f546a7c4a1.zip
(what-cursor-position): Use Lisp-readable syntax for octal and hex.
Reorder decimal, octal and hex values. Remove excess whitespace in the output. Use `=' in `column=' like in `point=' and `Hscroll='.
-rw-r--r--lisp/simple.el18
1 files changed, 9 insertions, 9 deletions
diff --git a/lisp/simple.el b/lisp/simple.el
index 2f07e1487cc..a5c89dbb1d0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -893,9 +893,9 @@ in *Help* buffer. See also the command `describe-char'."
893 (col (current-column))) 893 (col (current-column)))
894 (if (= pos end) 894 (if (= pos end)
895 (if (or (/= beg 1) (/= end (1+ total))) 895 (if (or (/= beg 1) (/= end (1+ total)))
896 (message "point=%d of %d (%d%%) <%d - %d> column %d %s" 896 (message "point=%d of %d (%d%%) <%d-%d> column=%d%s"
897 pos total percent beg end col hscroll) 897 pos total percent beg end col hscroll)
898 (message "point=%d of %d (EOB) column %d %s" 898 (message "point=%d of %d (EOB) column=%d%s"
899 pos total col hscroll)) 899 pos total col hscroll))
900 (let ((coding buffer-file-coding-system) 900 (let ((coding buffer-file-coding-system)
901 encoded encoding-msg display-prop under-display) 901 encoded encoding-msg display-prop under-display)
@@ -904,7 +904,7 @@ in *Help* buffer. See also the command `describe-char'."
904 (setq coding default-buffer-file-coding-system)) 904 (setq coding default-buffer-file-coding-system))
905 (if (not (char-valid-p char)) 905 (if (not (char-valid-p char))
906 (setq encoding-msg 906 (setq encoding-msg
907 (format "(0%o, %d, 0x%x, invalid)" char char char)) 907 (format "(%d, #o%o, #x%x, invalid)" char char char))
908 ;; Check if the character is displayed with some `display' 908 ;; Check if the character is displayed with some `display'
909 ;; text property. In that case, set under-display to the 909 ;; text property. In that case, set under-display to the
910 ;; buffer substring covered by that property. 910 ;; buffer substring covered by that property.
@@ -923,27 +923,27 @@ in *Help* buffer. See also the command `describe-char'."
923 (setq encoding-msg 923 (setq encoding-msg
924 (if display-prop 924 (if display-prop
925 (if (not (stringp display-prop)) 925 (if (not (stringp display-prop))
926 (format "(0%o, %d, 0x%x, part of display \"%s\")" 926 (format "(%d, #o%o, #x%x, part of display \"%s\")"
927 char char char under-display) 927 char char char under-display)
928 (format "(0%o, %d, 0x%x, part of display \"%s\"->\"%s\")" 928 (format "(%d, #o%o, #x%x, part of display \"%s\"->\"%s\")"
929 char char char under-display display-prop)) 929 char char char under-display display-prop))
930 (if encoded 930 (if encoded
931 (format "(0%o, %d, 0x%x, file %s)" 931 (format "(%d, #o%o, #x%x, file %s)"
932 char char char 932 char char char
933 (if (> (length encoded) 1) 933 (if (> (length encoded) 1)
934 "..." 934 "..."
935 (encoded-string-description encoded coding))) 935 (encoded-string-description encoded coding)))
936 (format "(0%o, %d, 0x%x)" char char char))))) 936 (format "(%d, #o%o, #x%x)" char char char)))))
937 (if detail 937 (if detail
938 ;; We show the detailed information about CHAR. 938 ;; We show the detailed information about CHAR.
939 (describe-char (point))) 939 (describe-char (point)))
940 (if (or (/= beg 1) (/= end (1+ total))) 940 (if (or (/= beg 1) (/= end (1+ total)))
941 (message "Char: %s %s point=%d of %d (%d%%) <%d - %d> column %d %s" 941 (message "Char: %s %s point=%d of %d (%d%%) <%d-%d> column=%d%s"
942 (if (< char 256) 942 (if (< char 256)
943 (single-key-description char) 943 (single-key-description char)
944 (buffer-substring-no-properties (point) (1+ (point)))) 944 (buffer-substring-no-properties (point) (1+ (point))))
945 encoding-msg pos total percent beg end col hscroll) 945 encoding-msg pos total percent beg end col hscroll)
946 (message "Char: %s %s point=%d of %d (%d%%) column %d %s" 946 (message "Char: %s %s point=%d of %d (%d%%) column=%d%s"
947 (if enable-multibyte-characters 947 (if enable-multibyte-characters
948 (if (< char 128) 948 (if (< char 128)
949 (single-key-description char) 949 (single-key-description char)