Mercurial > emacs
changeset 51584:0fdf268507e5
(cl-macroexpand-all):
Don't burp if (cadr (caddr found)) encounters a non-list element.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Mon, 16 Jun 2003 16:35:05 +0000 |
| parents | a44b585395b5 |
| children | b29f076f791a |
| files | lisp/emacs-lisp/cl-extra.el |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/emacs-lisp/cl-extra.el Mon Jun 16 16:31:29 2003 +0000 +++ b/lisp/emacs-lisp/cl-extra.el Mon Jun 16 16:35:05 2003 +0000 @@ -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 @@ '((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))