From b59a0352c5245ba63ce0be5fd2eec58229e45330 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 5 Dec 2019 19:31:00 -0800 Subject: [PATCH] 2019-12-05 regexp lint fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org/org-agenda.el (org-agenda-filter): Fix unescaped literal ‘+’ in regexp. Reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-12/msg00215.html * lisp/org/org.el (org-clone-subtree-with-time-shift): Fix a regexp typo that mishandled strings like ‘\1d’, reported by the same emaikl. * lisp/progmodes/verilog-mode.el (verilog-inject-inst): Omit unnecessary ‘?’ in regexp. Reported by Mattias Engdegård in: https://lists.gnu.org/r/emacs-devel/2019-12/msg00217.html --- lisp/org/org-agenda.el | 2 +- lisp/org/org.el | 2 +- lisp/progmodes/verilog-mode.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el index 7cb5cca34c..2404ca43dc 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el @@ -7670,7 +7670,7 @@ org-agenda-filter (if negate "Negative filter" "Filter") " [+cat-tag<0:10-/regexp/]: ") 'org-agenda-filter-completion-function)) - (keep (or (if (string-match "^+[-+]" f-string) + (keep (or (if (string-match "^\\+[+-]" f-string) (progn (setq f-string (substring f-string 1)) t)) (equal strip-or-accumulate '(16)))) (fc (if keep org-agenda-category-filter)) diff --git a/lisp/org/org.el b/lisp/org/org.el index b37beeb96a..f25c53caaf 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -7825,7 +7825,7 @@ org-clone-subtree-with-time-shift ""))) ;No time shift (doshift (and (org-string-nw-p shift) - (or (string-match "\\`[ \t]*\\([\\+\\-]?[0-9]+\\)\\([dwmy]\\)[ \t]*\\'" + (or (string-match "\\`[ \t]*\\([+-]?[0-9]+\\)\\([dwmy]\\)[ \t]*\\'" shift) (user-error "Invalid shift specification %s" shift))))) (goto-char end-of-tree) diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 6ec8d995c1..01914aade5 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -10973,7 +10973,7 @@ verilog-inject-inst (t ;; Delete identical interconnect (let ((case-fold-search nil)) ; So we don't convert upper-to-lower, etc - (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_$]+\\)?\\s *(\\s *\\1\\s *)\\s *" end-pt t) + (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_$]+\\)\\s *(\\s *\\1\\s *)\\s *" end-pt t) (delete-region (match-beginning 0) (match-end 0)) (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ; Keep it correct (while (or (looking-at "[ \t\n\f,]+") -- 2.23.0