summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2015-03-20 16:29:21 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2015-03-20 16:29:21 -0400
commit4cd31cf01964059ab29f735c7856c65631c46c28 (patch)
tree30ef2c74074cd9e0dc6407b198cbf685654474dc /lisp/emacs-lisp
parent932d0fdb4fb217adb4e894b595c2294abc4fef3e (diff)
downloademacs-4cd31cf01964059ab29f735c7856c65631c46c28.tar.gz
emacs-4cd31cf01964059ab29f735c7856c65631c46c28.tar.bz2
emacs-4cd31cf01964059ab29f735c7856c65631c46c28.zip
(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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/cl-macs.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index d3866783447..75c6a5687c4 100644
--- 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