diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2019-03-08 09:08:46 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2019-03-08 09:09:40 -0800 |
commit | db9c924d3d53f46846ad8fd74a5d08f4586a520e (patch) | |
tree | c37a307f6c34279103e203dc0a3c64eab9192a36 /lisp/progmodes | |
parent | 0dbc4a697afb2a1e409909289f608fd4da875c24 (diff) | |
download | emacs-db9c924d3d53f46846ad8fd74a5d08f4586a520e.tar.gz |
More regexp corrections and tweaks
From suggestions by Mattias EngdegÄrd in:
https://lists.gnu.org/r/emacs-devel/2019-03/msg00131.html
* lisp/arc-mode.el (archive-rar-summarize):
* lisp/gnus/gnus-art.el (gnus-button-valid-localpart-regexp):
* lisp/language/ethio-util.el (ethio-fidel-to-tex-buffer):
* lisp/nxml/rng-uri.el (rng-file-name-uri):
* lisp/org/org-mobile.el (org-mobile-apply):
* lisp/progmodes/cperl-mode.el (cperl-init-faces):
* lisp/progmodes/fortran.el (fortran-fill):
* lisp/progmodes/mantemp.el (mantemp-remove-comments)
(mantemp-remove-memfuncs, mantemp-insert-cxx-syntax):
* lisp/speedbar.el (speedbar-directory-buttons-follow):
* lisp/vc/add-log.el (change-log-font-lock-keywords):
Fix more regular expressions that seem to be typos or infelicities.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r-- | lisp/progmodes/cperl-mode.el | 4 | ||||
-rw-r--r-- | lisp/progmodes/fortran.el | 2 | ||||
-rw-r--r-- | lisp/progmodes/mantemp.el | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 0fe4b106c53..a9402e17a92 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el @@ -5736,9 +5736,9 @@ indentation and initial hashes. Behaves usually outside of comment." (if (eq (char-after (cperl-1- (match-end 0))) ?\{ ) 'font-lock-function-name-face 'font-lock-variable-name-face)))) - '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t;]" ; require A if B; + '("\\<\\(package\\|require\\|use\\|import\\|no\\|bootstrap\\)[ \t]+\\([a-zA-Z_][a-zA-Z_0-9:]*\\)[ \t;]" ; require A if B; 2 font-lock-function-name-face) - '("^[ \t]*format[ \t]+\\([a-zA-z_][a-zA-z_0-9:]*\\)[ \t]*=[ \t]*$" + '("^[ \t]*format[ \t]+\\([a-zA-Z_][a-zA-Z_0-9:]*\\)[ \t]*=[ \t]*$" 1 font-lock-function-name-face) (cond ((featurep 'font-lock-extra) '("\\([]}\\\\%@>*&]\\|\\$[a-zA-Z0-9_:]*\\)[ \t]*{[ \t]*\\(-?[a-zA-Z0-9_:]+\\)[ \t]*}" diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el index c1a267f4c5e..b8aa521cf66 100644 --- a/lisp/progmodes/fortran.el +++ b/lisp/progmodes/fortran.el @@ -2052,7 +2052,7 @@ If ALL is nil, only match comments that start in column > 0." (when (<= (point) bos) (move-to-column (1+ fill-column)) ;; What is this doing??? - (or (re-search-forward "[-\t\n,'+./*)=]" eol t) + (or (re-search-forward "[-\t\n,'+/*)=]" eol t) (goto-char bol))) (if (bolp) (re-search-forward "[ \t]" opoint t)) diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el index 9beeb4aae62..4190a847274 100644 --- a/lisp/progmodes/mantemp.el +++ b/lisp/progmodes/mantemp.el @@ -89,7 +89,7 @@ (save-excursion (goto-char (point-min)) (message "Removing comments") - (while (re-search-forward "^[A-z.()+0-9: ]*`\\|'.*$" nil t) + (while (re-search-forward "^[a-zA-Z.()+0-9: ]*`\\|'.*$" nil t) (replace-match "")))) (defun mantemp-remove-memfuncs () @@ -99,14 +99,14 @@ (goto-char (point-min)) (message "Removing member function extensions") (while (re-search-forward - "^[A-z :&*<>~=,0-9+]*>::operator " nil t nil) + "^[a-zA-Z :&*<>~=,0-9+]*>::operator " nil t nil) (progn (backward-char 11) (delete-region (point) (line-end-position)))) ;; Remove other member function extensions. (goto-char (point-min)) (message "Removing member function extensions") - (while (re-search-forward "^[A-z :&*<>~=,0-9+]*>::" nil t nil) + (while (re-search-forward "^[a-zA-Z :&*<>~=,0-9+]*>::" nil t nil) (progn (backward-char 2) (delete-region (point) (line-end-position)))))) @@ -154,7 +154,7 @@ the lines." (goto-char (point-min)) (message "Inserting 'template' for functions") (while (re-search-forward - "^template class [A-z :&*<>~=,0-9+!]*(" nil t nil) + "^template class [a-zA-Z :&*<>~=,0-9+!]*(" nil t nil) (progn (beginning-of-line) (forward-word-strictly 1) |