Remove subsumed repetitions in regexps
Make regexps smaller and faster by removing terms that are superfluous by virtue of standing next to another term that matches more. See https://lists.gnu.org/archive/html/emacs-devel/2020-01/msg00949.html for details. * lisp/bs.el (bs--make-header-match-string): * lisp/gnus/deuglify.el (gnus-outlook-repair-attribution-block): * lisp/gnus/message.el (message-subject-trailing-was-ask-regexp) (message-subject-trailing-was-regexp): * lisp/informat.el (Info-validate): * lisp/net/browse-url.el (browse-url-button-regexp): * lisp/net/rcirc.el (rcirc-url-regexp): * lisp/org/ob-core.el (org-babel-remove-result): * lisp/org/ob-fortran.el (org-babel-fortran-ensure-main-wrap): * lisp/org/org-capture.el (org-capture-set-target-location): * lisp/org/org-table.el (org-table-expand-lhs-ranges): * lisp/org/org.el (org-maybe-keyword-time-regexp, org-ts-regexp) (org-ts-regexp-inactive, org-ts-regexp-both): * lisp/play/gametree.el (gametree-hack-file-layout): * lisp/progmodes/cc-mode.el (c-Java-defun-prompt-regexp): * lisp/progmodes/idlw-shell.el (idlwave-shell-halting-error): * lisp/progmodes/ruby-mode.el (ruby-mode-set-encoding): * lisp/progmodes/verilog-mode.el (verilog-error-font-lock-keywords) (verilog-verilint-off, verilog-case-indent-level) (verilog-within-translate-off, verilog-start-translate-off) (verilog-back-to-start-translate-off, verilog-end-translate-off) (verilog-expand-dirnames): * lisp/term.el (term-control-seq-regexp): * lisp/textmodes/reftex-vars.el (featurep): * lisp/url/url-gw.el (url-open-telnet): * lisp/vc/ediff-ptch.el (ediff-context-diff-label-regexp): * lisp/vc/pcvs-parse.el (cvs-parse-status): * test/src/regex-emacs-tests.el (regex-tests-PCRE): Remove subsumed repetitions. * lisp/progmodes/sh-script.el (sh-syntax-propertize-function): Simplify repetition of a repetition.
This commit is contained in:
parent
8dc4034ed6
commit
770f76f050
23 changed files with 42 additions and 37 deletions
|
@ -119,7 +119,7 @@ patch. So, don't change these variables, unless the default doesn't work."
|
|||
(defcustom ediff-context-diff-label-regexp
|
||||
(let ((stuff "\\([^ \t\n]+\\)"))
|
||||
(concat "\\(" ; context diff 2-liner
|
||||
"^\\*\\*\\* +" stuff "[^*]+[\t ]*\n--- +" stuff
|
||||
"^\\*\\*\\* +" stuff "[^*]+\n--- +" stuff
|
||||
"\\|" ; unified format diff 2-liner
|
||||
"^--- +" stuff ".*\n\\+\\+\\+ +" stuff
|
||||
"\\)"))
|
||||
|
|
|
@ -472,7 +472,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
|
|||
;; Let's not get all worked up if the format changes a bit
|
||||
(cvs-match " *Working revision:.*$"))
|
||||
(cvs-or
|
||||
(cvs-match " *RCS Version:[ \t]*\\([0-9.]+\\)[ \t]*.*$" (head-rev 1))
|
||||
(cvs-match " *RCS Version:[ \t]*\\([0-9.]+\\).*$" (head-rev 1))
|
||||
(cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[ \t]*\\(.*\\)$"
|
||||
(head-rev 1))
|
||||
(cvs-match " *Repository revision:.*"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue