diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-06-16 16:35:05 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-06-16 16:35:05 +0000 |
| commit | 084ec4ce18bb661985082657220b1e96a95f0905 (patch) | |
| tree | ab75af997a7fc118678b185c6880c2de0240090e /lisp/emacs-lisp/cl-extra.el | |
| parent | cc1084a841fafad5adc3604ed9476fd2cab9f36a (diff) | |
| download | emacs-084ec4ce18bb661985082657220b1e96a95f0905.tar.gz | |
(cl-macroexpand-all):
Don't burp if (cadr (caddr found)) encounters a non-list element.
Diffstat (limited to 'lisp/emacs-lisp/cl-extra.el')
| -rw-r--r-- | lisp/emacs-lisp/cl-extra.el | 5 |
1 files changed, 3 insertions, 2 deletions
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 <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)) |