# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1055781305 0
# Node ID 0fdf268507e5562210f98659337d049cd6eca968
# Parent  a44b585395b5d0c312807d70f86773d8da29a72c
(cl-macroexpand-all):
Don't burp if (cadr (caddr found)) encounters a non-list element.

diff -r a44b585395b5 -r 0fdf268507e5 lisp/emacs-lisp/cl-extra.el
--- 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))