From 818fc6e128491de6bc5d630f6c9c8adf969e3ea8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 21 Sep 2015 07:58:41 -0700 Subject: [PATCH] Clarify or replace a few \u escapes. * doc/lispref/nonascii.texi (Character Properties) More-detailed commentary for \u escapes. * lisp/progmodes/python.el (python--prettify-symbols-alist): * lisp/replace.el (query-replace-from-to-separator): * lisp/textmodes/rst.el (rst-bullets, rst-re-alist-def) (rst-mode-syntax-table): * lisp/whitespace.el (whitespace-display-mappings): Prefer actual character to \u escape when this makes the code easier to follow in the usual case where Unicode chars can be displayed. --- doc/lispref/nonascii.texi | 6 +++--- lisp/progmodes/python.el | 6 +++--- lisp/replace.el | 2 +- lisp/textmodes/rst.el | 18 +++++++++--------- lisp/whitespace.el | 16 ++++++++-------- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index fb76de1ca09..3351b841f45 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -583,17 +583,17 @@ This function returns the value of @var{char}'s @var{propname} property. @result{} Nd @end group @group -;; subscript 4 +;; U+2084 SUBSCRIPT FOUR (get-char-code-property ?\u2084 'digit-value) @result{} 4 @end group @group -;; one fifth +;; U+2155 VULGAR FRACTION ONE FIFTH (get-char-code-property ?\u2155 'numeric-value) @result{} 0.2 @end group @group -;; Roman IV +;; U+2163 ROMAN NUMERAL FOUR (get-char-code-property ?\u2163 'numeric-value) @result{} 4 @end group diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 4fdf2ca8542..b641e300163 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -621,9 +621,9 @@ The type returned can be `comment', `string' or `paren'." (0 (ignore (python-syntax-stringify)))))) (defconst python--prettify-symbols-alist - '(("lambda" . ?\u03bb) - ("and" . ?\u2227) - ("or" . ?\u2228))) + '(("lambda" . ?λ) + ("and" . ?∧) + ("or" . ?∨))) (defsubst python-syntax-count-quotes (quote-char &optional point limit) "Count number of quotes around point (max is 3). diff --git a/lisp/replace.el b/lisp/replace.el index 37e97e2c215..3a908ac4d8d 100644 --- a/lisp/replace.el +++ b/lisp/replace.el @@ -76,7 +76,7 @@ to the minibuffer that reads the string to replace, or invoke replacements from Isearch by using a key sequence like `C-s C-s M-%'." "24.3") (defcustom query-replace-from-to-separator - (propertize (if (char-displayable-p ?\u2192) " \u2192 " " -> ") + (propertize (if (char-displayable-p ?→) " → " " -> ") 'face 'minibuffer-prompt) "String that separates FROM and TO in the history of replacement pairs." ;; Avoids error when attempt to autoload char-displayable-p fails diff --git a/lisp/textmodes/rst.el b/lisp/textmodes/rst.el index e6bfe5f1662..581e16e7cd8 100644 --- a/lisp/textmodes/rst.el +++ b/lisp/textmodes/rst.el @@ -296,7 +296,7 @@ in parentheses follows the development revision and the time stamp.") ;; syntax. (defconst rst-bullets ;; Sorted so they can form a character class when concatenated. - '(?- ?* ?+ ?\u2022 ?\u2023 ?\u2043) + '(?- ?* ?+ ?• ?‣ ?⁃) "List of all possible bullet characters for bulleted lists.") (defconst rst-uri-schemes @@ -392,8 +392,8 @@ in parentheses follows the development revision and the time stamp.") ; item tag. ;; Inline markup (`ilm') - (ilm-pfx (:alt "^" hws-prt "[-'\"([{<\u2018\u201c\u00ab\u2019/:]")) - (ilm-sfx (:alt "$" hws-prt "[]-'\")}>\u2019\u201d\u00bb/:.,;!?\\]")) + (ilm-pfx (:alt "^" hws-prt "[-'\"([{<‘“«’/:]")) + (ilm-sfx (:alt "$" hws-prt "[]-'\")}>’”»/:.,;!?\\]")) ;; Inline markup content (`ilc') (ilcsgl-tag "\\S ") ; A single non-white character. @@ -778,12 +778,12 @@ This inherits from Text mode.") (modify-syntax-entry ?\\ "\\" st) (modify-syntax-entry ?_ "." st) (modify-syntax-entry ?| "." st) - (modify-syntax-entry ?\u00ab "." st) - (modify-syntax-entry ?\u00bb "." st) - (modify-syntax-entry ?\u2018 "." st) - (modify-syntax-entry ?\u2019 "." st) - (modify-syntax-entry ?\u201c "." st) - (modify-syntax-entry ?\u201d "." st) + (modify-syntax-entry ?« "." st) + (modify-syntax-entry ?» "." st) + (modify-syntax-entry ?‘ "." st) + (modify-syntax-entry ?’ "." st) + (modify-syntax-entry ?“ "." st) + (modify-syntax-entry ?” "." st) st) "Syntax table used while in `rst-mode'.") diff --git a/lisp/whitespace.el b/lisp/whitespace.el index 0c208502c34..d45a1dcc47f 100644 --- a/lisp/whitespace.el +++ b/lisp/whitespace.el @@ -891,22 +891,22 @@ Used when `whitespace-style' includes `lines' or `lines-tail'." ;; Hacked from `visible-whitespace-mappings' in visws.el (defcustom whitespace-display-mappings '( - (space-mark ?\ [?\u00B7] [?.]) ; space - centered dot - (space-mark ?\xA0 [?\u00A4] [?_]) ; hard space - currency + (space-mark ?\ [?·] [?.]) ; space - middle dot + (space-mark ?\xA0 [?¤] [?_]) ; hard space - currency sign ;; NEWLINE is displayed using the face `whitespace-newline' (newline-mark ?\n [?$ ?\n]) ; eol - dollar sign - ;; (newline-mark ?\n [?\u21B5 ?\n] [?$ ?\n]) ; eol - downwards arrow - ;; (newline-mark ?\n [?\u00B6 ?\n] [?$ ?\n]) ; eol - pilcrow - ;; (newline-mark ?\n [?\u00AF ?\n] [?$ ?\n]) ; eol - overscore - ;; (newline-mark ?\n [?\u00AC ?\n] [?$ ?\n]) ; eol - negation - ;; (newline-mark ?\n [?\u00B0 ?\n] [?$ ?\n]) ; eol - degrees + ;; (newline-mark ?\n [?↵ ?\n] [?$ ?\n]) ; eol - downwards arrow + ;; (newline-mark ?\n [?¶ ?\n] [?$ ?\n]) ; eol - pilcrow + ;; (newline-mark ?\n [?¯ ?\n] [?$ ?\n]) ; eol - overscore + ;; (newline-mark ?\n [?¬ ?\n] [?$ ?\n]) ; eol - negation + ;; (newline-mark ?\n [?° ?\n] [?$ ?\n]) ; eol - degrees ;; ;; WARNING: the mapping below has a problem. ;; When a TAB occupies exactly one column, it will display the ;; character ?\xBB at that column followed by a TAB which goes to ;; the next TAB column. ;; If this is a problem for you, please, comment the line below. - (tab-mark ?\t [?\u00BB ?\t] [?\\ ?\t]) ; tab - left quote mark + (tab-mark ?\t [?» ?\t] [?\\ ?\t]) ; tab - right guillemet ) "Specify an alist of mappings for displaying characters. -- 2.39.2