emacs-lisp/checkdoc.el: Don't complain about args starting with _.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e74733015c9856129f6da320cf70b6387a433f65..2d150ba3dd2d876ae8ce5732698724c1c293bdb8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-25  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+       Don't complain about args starting with _.
+
 2015-03-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * international/mule-cmds.el (mule--ucs-names-annotation): New func.

diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 288e25e60605955682e453465b4771abbe6b13b3..777fed082d9b7b04ce5e6232de0ba8f1863a9e2b 100644 (file)
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1663,14 +1663,15 @@ function,command,variable,option or symbol." ms1))))))
 
             ;;   Addendum:  Make sure they appear in the doc in the same
             ;;              order that they are found in the arg list.
-            (let ((args (cdr (cdr (cdr (cdr fp)))))
+            (let ((args (nthcdr 4 fp))
                   (last-pos 0)
                   (found 1)
                   (order (and (nth 3 fp) (car (nth 3 fp))))
                   (nocheck (append '("&optional" "&rest") (nth 3 fp)))
                   (inopts nil))
               (while (and args found (> found last-pos))
-                (if (member (car args) nocheck)
+                 (if (or (member (car args) nocheck)
+                         (string-match "\\`_" (car args)))
                     (setq args (cdr args)
                           inopts t)
                   (setq last-pos found