aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2018-01-30 07:50:25 -0800
committerGlenn Morris2018-01-30 07:50:25 -0800
commit084cfae0e624469ebca78b155ffe4e2c20f2b205 (patch)
tree090f0efbf80386248f99a054e45be8206d174b15 /lisp
parent84055bda91d48dd603110b0805560cf1df205a83 (diff)
parentbc8dc37f1cd6dcede1f5f409a3aeb8fb345d642e (diff)
downloademacs-084cfae0e624469ebca78b155ffe4e2c20f2b205.tar.gz
emacs-084cfae0e624469ebca78b155ffe4e2c20f2b205.zip
Merge from origin/emacs-26
bc8dc37 (origin/emacs-26) Minor copyedits in "Distribution" chapter o... 1c7a936 Minor copyedits in "Entering" chapter of Emacs manual. 1d4498b Minor wording change in the Emacs manual 2bf49e7 Fix a typo in the Emacs manual f3546a2 Improve the "Basic" chapter of the Emacs manual 691431e Resurrect lost text in lispref 956807b * lisp/emacs-lisp/rx.el (rx): Fix the definition of 'blank'. 7d90d2e Proofread os.texi and files.texi 490c736 Minor improvements in the "International" chapter of Emacs ma... 79252d3 Minor improvement in "Text" chapter of Emacs manual
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/rx.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 37aa25b556d..c4f6d4f70ea 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -57,7 +57,6 @@
57;; (rx (and line-start (0+ (in "a-z")))) 57;; (rx (and line-start (0+ (in "a-z"))))
58;; 58;;
59;; "\n[^ \t]" 59;; "\n[^ \t]"
60;; (rx (and "\n" (not blank))), or
61;; (rx (and "\n" (not (any " \t")))) 60;; (rx (and "\n" (not (any " \t"))))
62;; 61;;
63;; "\\*\\*\\* EOOH \\*\\*\\*\n" 62;; "\\*\\*\\* EOOH \\*\\*\\*\n"
@@ -74,9 +73,9 @@
74;; "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*" 73;; "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
75;; (rx (and line-start 74;; (rx (and line-start
76;; "content-transfer-encoding:" 75;; "content-transfer-encoding:"
77;; (+ (? ?\n)) blank 76;; (+ (? ?\n)) (any " \t")
78;; "quoted-printable" 77;; "quoted-printable"
79;; (+ (? ?\n)) blank)) 78;; (+ (? ?\n)) (any " \t"))
80;; 79;;
81;; (concat "^\\(?:" something-else "\\)") 80;; (concat "^\\(?:" something-else "\\)")
82;; (rx (and line-start (eval something-else))), statically or 81;; (rx (and line-start (eval something-else))), statically or
@@ -962,7 +961,11 @@ CHAR
962 matches 0 through 9, a through f and A through F. 961 matches 0 through 9, a through f and A through F.
963 962
964`blank' 963`blank'
965 matches space and tab only. 964 matches horizontal whitespace, as defined by Annex C of the
965 Unicode Technical Standard #18. In particular, it matches
966 spaces, tabs, and other characters whose Unicode
967 `general-category' property indicates they are spacing
968 separators.
966 969
967`graphic', `graph' 970`graphic', `graph'
968 matches graphic characters--everything except whitespace, ASCII 971 matches graphic characters--everything except whitespace, ASCII