diff options
| author | Paul Eggert | 2019-12-05 19:31:00 -0800 |
|---|---|---|
| committer | Paul Eggert | 2019-12-05 19:32:12 -0800 |
| commit | 4c933077157ba409d645f4649c8a3a8e534d53d5 (patch) | |
| tree | 033484f3c691c3f678a79597e28cd12c34a02fed | |
| parent | 5ee43ba0dfd96e5d39da556260346bd3c8ff99c1 (diff) | |
| download | emacs-4c933077157ba409d645f4649c8a3a8e534d53d5.tar.gz emacs-4c933077157ba409d645f4649c8a3a8e534d53d5.zip | |
2019-12-05 regexp lint fixes
* 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
| -rw-r--r-- | lisp/org/org-agenda.el | 2 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 | ||||
| -rw-r--r-- | 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 7cb5cca34cd..2404ca43dcb 100644 --- a/lisp/org/org-agenda.el +++ b/lisp/org/org-agenda.el | |||
| @@ -7670,7 +7670,7 @@ the variable `org-agenda-auto-exclude-function'." | |||
| 7670 | (if negate "Negative filter" "Filter") | 7670 | (if negate "Negative filter" "Filter") |
| 7671 | " [+cat-tag<0:10-/regexp/]: ") | 7671 | " [+cat-tag<0:10-/regexp/]: ") |
| 7672 | 'org-agenda-filter-completion-function)) | 7672 | 'org-agenda-filter-completion-function)) |
| 7673 | (keep (or (if (string-match "^+[-+]" f-string) | 7673 | (keep (or (if (string-match "^\\+[+-]" f-string) |
| 7674 | (progn (setq f-string (substring f-string 1)) t)) | 7674 | (progn (setq f-string (substring f-string 1)) t)) |
| 7675 | (equal strip-or-accumulate '(16)))) | 7675 | (equal strip-or-accumulate '(16)))) |
| 7676 | (fc (if keep org-agenda-category-filter)) | 7676 | (fc (if keep org-agenda-category-filter)) |
diff --git a/lisp/org/org.el b/lisp/org/org.el index b37beeb96a6..f25c53caaff 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el | |||
| @@ -7825,7 +7825,7 @@ with the original repeater." | |||
| 7825 | ""))) ;No time shift | 7825 | ""))) ;No time shift |
| 7826 | (doshift | 7826 | (doshift |
| 7827 | (and (org-string-nw-p shift) | 7827 | (and (org-string-nw-p shift) |
| 7828 | (or (string-match "\\`[ \t]*\\([\\+\\-]?[0-9]+\\)\\([dwmy]\\)[ \t]*\\'" | 7828 | (or (string-match "\\`[ \t]*\\([+-]?[0-9]+\\)\\([dwmy]\\)[ \t]*\\'" |
| 7829 | shift) | 7829 | shift) |
| 7830 | (user-error "Invalid shift specification %s" shift))))) | 7830 | (user-error "Invalid shift specification %s" shift))))) |
| 7831 | (goto-char end-of-tree) | 7831 | (goto-char end-of-tree) |
diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 6ec8d995c15..01914aade5a 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el | |||
| @@ -10973,7 +10973,7 @@ shown) will make this into: | |||
| 10973 | (t | 10973 | (t |
| 10974 | ;; Delete identical interconnect | 10974 | ;; Delete identical interconnect |
| 10975 | (let ((case-fold-search nil)) ; So we don't convert upper-to-lower, etc | 10975 | (let ((case-fold-search nil)) ; So we don't convert upper-to-lower, etc |
| 10976 | (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_$]+\\)?\\s *(\\s *\\1\\s *)\\s *" end-pt t) | 10976 | (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_$]+\\)\\s *(\\s *\\1\\s *)\\s *" end-pt t) |
| 10977 | (delete-region (match-beginning 0) (match-end 0)) | 10977 | (delete-region (match-beginning 0) (match-end 0)) |
| 10978 | (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ; Keep it correct | 10978 | (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ; Keep it correct |
| 10979 | (while (or (looking-at "[ \t\n\f,]+") | 10979 | (while (or (looking-at "[ \t\n\f,]+") |