mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-25 19:11:56 +00:00
Simplify regexp in make-news-html-file
* admin/admin.el (make-news-html-file): Simplify regexp. Suggested by Mattias Engdegård <mattiase@acm.org>.
This commit is contained in:
parent
069ffbda09
commit
5dbe4fa64a
@ -883,30 +883,17 @@ $Date: %s $
|
||||
|
||||
;; Use Org-mode markers for 'symbols', 'C-x k', etc.
|
||||
(replace-regexp-in-region
|
||||
(rx-let ((key (seq
|
||||
;; Modifier (optional)
|
||||
(? (any "ACHMSs") "-")
|
||||
(or
|
||||
;; single key
|
||||
(not (any " \n"))
|
||||
;; "<return>" and "<remap> <foo>"
|
||||
(seq "<"
|
||||
(+ (any "A-Za-z-"))
|
||||
(+ (seq " " (+ (any "A-Za-z-"))))
|
||||
">")
|
||||
"NUL" "RET" "LFD" "TAB"
|
||||
"ESC" "SPC" "DEL")))
|
||||
(email (seq (+ (not (any " @\n")))
|
||||
"@"
|
||||
(+ (not (any " @\n")))))
|
||||
(lisp-symbol (regexp lisp-mode-symbol-regexp)))
|
||||
(rx "'" (group
|
||||
(or lisp-symbol
|
||||
email
|
||||
(seq "M-x " lisp-symbol)
|
||||
(seq key (+ " " key))))
|
||||
"'"))
|
||||
"~\\1~" (point-min) (point-max))
|
||||
(rx (or (: (group (in " \t\n("))
|
||||
"'"
|
||||
(group (+ (or (not (in "'\n"))
|
||||
(: "'" (not (in " .,\t\n)"))))))
|
||||
"'"
|
||||
(group (in ",.;:!? \t\n)")))
|
||||
;; Buffer names, e.g. "*scratch*".
|
||||
(: "\""
|
||||
(group-n 2 "*" (+ (not (in "*\""))) "*")
|
||||
"\"")))
|
||||
"\\1~\\2~\\3" (point-min) (point-max))
|
||||
|
||||
;; Format code blocks.
|
||||
(while (re-search-forward "^ " nil t)
|
||||
|
Loading…
Reference in New Issue
Block a user