From: Stefan Monnier Date: Mon, 16 Jun 2003 16:35:05 +0000 (+0000) Subject: (cl-macroexpand-all): X-Git-Tag: ttn-vms-21-2-B4~9638 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=084ec4ce18bb661985082657220b1e96a95f0905;p=emacs.git (cl-macroexpand-all): Don't burp if (cadr (caddr found)) encounters a non-list element. --- diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el index f8fcd020703..b0b8d3379f2 100644 --- a/lisp/emacs-lisp/cl-extra.el +++ b/lisp/emacs-lisp/cl-extra.el @@ -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 ;; 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))