aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-09-21 07:58:41 -0700
committerPaul Eggert2015-09-21 07:59:16 -0700
commit818fc6e128491de6bc5d630f6c9c8adf969e3ea8 (patch)
tree3c8b6bb8d47b1c5d0ea3307d3e460d0f0cf52597
parentcf91ea794be50c2d3c572726b1d4e53ab92da506 (diff)
downloademacs-818fc6e128491de6bc5d630f6c9c8adf969e3ea8.tar.gz
emacs-818fc6e128491de6bc5d630f6c9c8adf969e3ea8.zip
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.
-rw-r--r--doc/lispref/nonascii.texi6
-rw-r--r--lisp/progmodes/python.el6
-rw-r--r--lisp/replace.el2
-rw-r--r--lisp/textmodes/rst.el18
-rw-r--r--lisp/whitespace.el16
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.
583 @result{} Nd 583 @result{} Nd
584@end group 584@end group
585@group 585@group
586;; subscript 4 586;; U+2084 SUBSCRIPT FOUR
587(get-char-code-property ?\u2084 'digit-value) 587(get-char-code-property ?\u2084 'digit-value)
588 @result{} 4 588 @result{} 4
589@end group 589@end group
590@group 590@group
591;; one fifth 591;; U+2155 VULGAR FRACTION ONE FIFTH
592(get-char-code-property ?\u2155 'numeric-value) 592(get-char-code-property ?\u2155 'numeric-value)
593 @result{} 0.2 593 @result{} 0.2
594@end group 594@end group
595@group 595@group
596;; Roman IV 596;; U+2163 ROMAN NUMERAL FOUR
597(get-char-code-property ?\u2163 'numeric-value) 597(get-char-code-property ?\u2163 'numeric-value)
598 @result{} 4 598 @result{} 4
599@end group 599@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'."
621 (0 (ignore (python-syntax-stringify)))))) 621 (0 (ignore (python-syntax-stringify))))))
622 622
623(defconst python--prettify-symbols-alist 623(defconst python--prettify-symbols-alist
624 '(("lambda" . ?\u03bb) 624 '(("lambda" . ?λ)
625 ("and" . ?\u2227) 625 ("and" . ?)
626 ("or" . ?\u2228))) 626 ("or" . ?)))
627 627
628(defsubst python-syntax-count-quotes (quote-char &optional point limit) 628(defsubst python-syntax-count-quotes (quote-char &optional point limit)
629 "Count number of quotes around point (max is 3). 629 "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
76from Isearch by using a key sequence like `C-s C-s M-%'." "24.3") 76from Isearch by using a key sequence like `C-s C-s M-%'." "24.3")
77 77
78(defcustom query-replace-from-to-separator 78(defcustom query-replace-from-to-separator
79 (propertize (if (char-displayable-p ?\u2192) " \u2192 " " -> ") 79 (propertize (if (char-displayable-p ?) " " " -> ")
80 'face 'minibuffer-prompt) 80 'face 'minibuffer-prompt)
81 "String that separates FROM and TO in the history of replacement pairs." 81 "String that separates FROM and TO in the history of replacement pairs."
82 ;; Avoids error when attempt to autoload char-displayable-p fails 82 ;; 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.")
296;; syntax. 296;; syntax.
297(defconst rst-bullets 297(defconst rst-bullets
298 ;; Sorted so they can form a character class when concatenated. 298 ;; Sorted so they can form a character class when concatenated.
299 '(?- ?* ?+ ?\u2022 ?\u2023 ?\u2043) 299 '(?- ?* ?+ ? ? ?)
300 "List of all possible bullet characters for bulleted lists.") 300 "List of all possible bullet characters for bulleted lists.")
301 301
302(defconst rst-uri-schemes 302(defconst rst-uri-schemes
@@ -392,8 +392,8 @@ in parentheses follows the development revision and the time stamp.")
392 ; item tag. 392 ; item tag.
393 393
394 ;; Inline markup (`ilm') 394 ;; Inline markup (`ilm')
395 (ilm-pfx (:alt "^" hws-prt "[-'\"([{<\u2018\u201c\u00ab\u2019/:]")) 395 (ilm-pfx (:alt "^" hws-prt "[-'\"([{<‘“«’/:]"))
396 (ilm-sfx (:alt "$" hws-prt "[]-'\")}>\u2019\u201d\u00bb/:.,;!?\\]")) 396 (ilm-sfx (:alt "$" hws-prt "[]-'\")}>’”»/:.,;!?\\]"))
397 397
398 ;; Inline markup content (`ilc') 398 ;; Inline markup content (`ilc')
399 (ilcsgl-tag "\\S ") ; A single non-white character. 399 (ilcsgl-tag "\\S ") ; A single non-white character.
@@ -778,12 +778,12 @@ This inherits from Text mode.")
778 (modify-syntax-entry ?\\ "\\" st) 778 (modify-syntax-entry ?\\ "\\" st)
779 (modify-syntax-entry ?_ "." st) 779 (modify-syntax-entry ?_ "." st)
780 (modify-syntax-entry ?| "." st) 780 (modify-syntax-entry ?| "." st)
781 (modify-syntax-entry ?\u00ab "." st) 781 (modify-syntax-entry ?« "." st)
782 (modify-syntax-entry ?\u00bb "." st) 782 (modify-syntax-entry ?» "." st)
783 (modify-syntax-entry ?\u2018 "." st) 783 (modify-syntax-entry ? "." st)
784 (modify-syntax-entry ?\u2019 "." st) 784 (modify-syntax-entry ? "." st)
785 (modify-syntax-entry ?\u201c "." st) 785 (modify-syntax-entry ? "." st)
786 (modify-syntax-entry ?\u201d "." st) 786 (modify-syntax-entry ? "." st)
787 st) 787 st)
788 "Syntax table used while in `rst-mode'.") 788 "Syntax table used while in `rst-mode'.")
789 789
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'."
891;; Hacked from `visible-whitespace-mappings' in visws.el 891;; Hacked from `visible-whitespace-mappings' in visws.el
892(defcustom whitespace-display-mappings 892(defcustom whitespace-display-mappings
893 '( 893 '(
894 (space-mark ?\ [?\u00B7] [?.]) ; space - centered dot 894 (space-mark ?\ [?·] [?.]) ; space - middle dot
895 (space-mark ?\xA0 [?\u00A4] [?_]) ; hard space - currency 895 (space-mark ?\xA0 [?¤] [?_]) ; hard space - currency sign
896 ;; NEWLINE is displayed using the face `whitespace-newline' 896 ;; NEWLINE is displayed using the face `whitespace-newline'
897 (newline-mark ?\n [?$ ?\n]) ; eol - dollar sign 897 (newline-mark ?\n [?$ ?\n]) ; eol - dollar sign
898 ;; (newline-mark ?\n [?\u21B5 ?\n] [?$ ?\n]) ; eol - downwards arrow 898 ;; (newline-mark ?\n [? ?\n] [?$ ?\n]) ; eol - downwards arrow
899 ;; (newline-mark ?\n [?\u00B6 ?\n] [?$ ?\n]) ; eol - pilcrow 899 ;; (newline-mark ?\n [? ?\n] [?$ ?\n]) ; eol - pilcrow
900 ;; (newline-mark ?\n [?\u00AF ?\n] [?$ ?\n]) ; eol - overscore 900 ;; (newline-mark ?\n [?¯ ?\n] [?$ ?\n]) ; eol - overscore
901 ;; (newline-mark ?\n [?\u00AC ?\n] [?$ ?\n]) ; eol - negation 901 ;; (newline-mark ?\n [?¬ ?\n] [?$ ?\n]) ; eol - negation
902 ;; (newline-mark ?\n [?\u00B0 ?\n] [?$ ?\n]) ; eol - degrees 902 ;; (newline-mark ?\n [?° ?\n] [?$ ?\n]) ; eol - degrees
903 ;; 903 ;;
904 ;; WARNING: the mapping below has a problem. 904 ;; WARNING: the mapping below has a problem.
905 ;; When a TAB occupies exactly one column, it will display the 905 ;; When a TAB occupies exactly one column, it will display the
906 ;; character ?\xBB at that column followed by a TAB which goes to 906 ;; character ?\xBB at that column followed by a TAB which goes to
907 ;; the next TAB column. 907 ;; the next TAB column.
908 ;; If this is a problem for you, please, comment the line below. 908 ;; If this is a problem for you, please, comment the line below.
909 (tab-mark ?\t [?\u00BB ?\t] [?\\ ?\t]) ; tab - left quote mark 909 (tab-mark ?\t [?» ?\t] [?\\ ?\t]) ; tab - right guillemet
910 ) 910 )
911 "Specify an alist of mappings for displaying characters. 911 "Specify an alist of mappings for displaying characters.
912 912