mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-03 02:31:03 -08:00
Code Issues Projects Releases Wiki Activity

Fix recently introduced bug in checkdoc

Browse source 
* lisp/emacs-lisp/checkdoc.el (checkdoc-in-abbreviation-p): Fix
recently introduced bug where some abbreviations weren't recognized.
* test/lisp/emacs-lisp/checkdoc-tests.el
(checkdoc-tests-in-abbrevation-p/basic-case): Extend test.
This commit is contained in:
Stefan Kangas 2021-09-24 23:00:57 +02:00
parent 2ee5c80ff5
commit f17fb37c51
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2105,14 +2105,15 @@ Examples of recognized abbreviations: \"e.g.\", \"i.e.\", \"cf.\"."
(save-excursion
(goto-char begin)
(condition-case nil
(let ((single-letter t))
(let (single-letter)
(forward-word -1)
;; Skip over all dots backwards, as `forward-word' will only
;; go one dot at a time in a string like "e.g.".
(while (save-excursion (forward-char -1)
(looking-at (rx ".")))
(setq single-letter nil)
(forward-word -1))
(when (= (point) (1- begin))
(setq single-letter t))
;; Piece of an abbreviation.
(looking-at
(if single-letter

5
test/lisp/emacs-lisp/checkdoc-tests.el
View file

@ -131,7 +131,10 @@ See the comments in Bug#24998."
(checkdoc-in-abbreviation-p (point))))
(ert-deftest checkdoc-tests-in-abbrevation-p/basic-case ()
(should (checkdoc-tests--abbrev-test "foo bar e.g. baz" "e.g")))
(should (checkdoc-tests--abbrev-test "foo bar e.g. baz" "e.g"))
(should (checkdoc-tests--abbrev-test "behavior/errors etc. that" "etc"))
(should (checkdoc-tests--abbrev-test "foo vs. bar" "vs"))
(should (checkdoc-tests--abbrev-test "spy a.k.a. spy" "a.k.a")))
(ert-deftest checkdoc-tests-in-abbrevation-p/with-parens ()
(should (checkdoc-tests--abbrev-test "foo bar (e.g. baz)" "e.g")))