(cl-defsubst): Ignore false-positive occurrences of args via &cl-defs

Fixes: debbugs:20149
* lisp/emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive
occurrences of args via &cl-defs.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cecec469ed8f4e5202429d4e579d09ffcc81776d..ee4e021b9406fe5e95edadf7d7465789467bf48a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-20  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/cl-macs.el (cl-defsubst): Ignore false-positive
+       occurrences of args via &cl-defs (bug#20149).
+
 2015-03-20  Alan Mackenzie  <acm@muc.de>
 
        Fix debbugs#20146

diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index d386678344796c937fa653c97aa1079edbc8517d..75c6a5687c4c0a0e7064d7ed650f1c1346aa6f0f 100644 (file)
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -2446,10 +2446,11 @@ The function's arguments should be treated as immutable.
 \(fn NAME ARGLIST [DOCSTRING] BODY...)"
   (declare (debug cl-defun) (indent 2))
   (let* ((argns (cl--arglist-args args))
+        (real-args (if (eq '&cl-defs (car args)) (cddr args) args))
          (p argns)
          ;; (pbody (cons 'progn body))
          )
-    (while (and p (eq (cl--expr-contains args (car p)) 1)) (pop p))
+    (while (and p (eq (cl--expr-contains real-args (car p)) 1)) (pop p))
     `(progn
        ,(if p nil   ; give up if defaults refer to earlier args
           `(cl-define-compiler-macro ,name