mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
(cl-macroexpand-all):
Don't burp if (cadr (caddr found)) encounters a non-list element.
This commit is contained in:
parent
cc1084a841
commit
084ec4ce18
1 changed files with 3 additions and 2 deletions
|
|
@ -1,6 +1,6 @@
|
|||
;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*-
|
||||
|
||||
;; Copyright (C) 1993,2000 Free Software Foundation, Inc.
|
||||
;; Copyright (C) 1993,2000,2003 Free Software Foundation, Inc.
|
||||
|
||||
;; Author: Dave Gillespie <daveg@synaptics.com>
|
||||
;; Keywords: extensions
|
||||
|
|
@ -718,7 +718,8 @@ This also does some trivial optimizations to make the form prettier."
|
|||
'((quote --cl-rest--)))))))
|
||||
(list (car form) (list* 'lambda (cadadr form) body))))
|
||||
(let ((found (assq (cadr form) env)))
|
||||
(if (eq (cadr (caddr found)) 'cl-labels-args)
|
||||
(if (and found (ignore-errors
|
||||
(eq (cadr (caddr found)) 'cl-labels-args)))
|
||||
(cl-macroexpand-all (cadr (caddr (cadddr found))) env)
|
||||
form))))
|
||||
((memq (car form) '(defun defmacro))
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue