* emacs-lisp/checkdoc.el (checkdoc-proper-noun-region-engine): Use

help-xref-info-regexp and help-xref-url-regexp to identify links.
(Further to Bug#3921).

diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 0edfa4ab4be8492f2339fd3e464c1b0a7692923a..6b226be0b28ca01d4a787200431462c29e34acd7 100644 (file)
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -173,6 +173,9 @@
 (defvar checkdoc-version "0.6.1"
   "Release version of checkdoc you are currently running.")
 
+(require 'help-mode) ;; for help-xref-info-regexp
+(require 'thingatpt) ;; for handy thing-at-point-looking-at
+
 (defvar compilation-error-regexp-alist)
 (defvar compilation-mode-font-lock-keywords)
 
@@ -2017,11 +2020,11 @@ If the offending word is in a piece of quoted text, then it is skipped."
                         (not (and (= ?/ (char-after e))
                                   (= ?/ (char-before b))))
                         (not (checkdoc-in-example-string-p begin end))
-                        ;; info node
-                        (not (save-excursion
-                               (goto-char b)
-                               (looking-back "\\<[Ii]nfo[ \t\n]+\\(node\\|anchor\\)[ \t\n]+`("
-                                             (line-beginning-position)))))
+                        ;; info or url links left alone
+                        (not (thing-at-point-looking-at
+                              help-xref-info-regexp))
+                        (not (thing-at-point-looking-at
+                              help-xref-url-regexp)))
                    (if (checkdoc-autofix-ask-replace
                         b e (format "Text %s should be capitalized.  Fix? "
                                     text)