procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

checkdoc: Verify format of yes-or-no-p and format-message

Browse source 
* lisp/emacs-lisp/checkdoc.el (checkdoc-message-text-next-string):
Check also for "yes-or-no-p" and "format-message".  Convert regexps to
use rx.
This commit is contained in:
Stefan Kangas 2021-09-19 14:09:20 +02:00
parent 8772d81966
commit 83508013a8
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
lisp/emacs-lisp/checkdoc.el
View file

@ -2463,10 +2463,18 @@ Return the message classification.
Argument END is the maximum bounds to search in."
(let ((return nil))
(while (and (not return)
(re-search-forward
"(\\s-*\\(\\(\\w\\|\\s_\\)*error\\|\
\\(\\w\\|\\s_\\)*y-or-n-p\\(-with-timeout\\)?\
\\|checkdoc-autofix-ask-replace\\)[ \t\n]+" end t))
(re-search-forward
(rx "("
(* (syntax whitespace))
(group
(or (seq (* (group (or wordchar (syntax symbol))))
"error")
(seq (* (group (or wordchar (syntax symbol))))
(or "y-or-n-p" "yes-or-no-p")
(? (group "-with-timeout")))
"checkdoc-autofix-ask-replace"))
(+ (any "\n\t ")))
end t))
(let* ((fn (match-string 1))
(type (cond ((string-match "error" fn)
'error)
@ -2475,7 +2483,7 @@ Argument END is the maximum bounds to search in."
(progn (forward-sexp 2)
(skip-chars-forward " \t\n")))
(if (and (eq type 'y-or-n-p)
(looking-at "(format[ \t\n]+"))
(looking-at (rx "(format" (? "-message") (+ (any " \t\n")))))
(goto-char (match-end 0)))
(skip-chars-forward " \t\n")
(if (not (looking-at "\""))