[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/cl-extra.el

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/cl-extra.el
diff -c emacs/lisp/emacs-lisp/cl-extra.el:1.24 
emacs/lisp/emacs-lisp/cl-extra.el:1.25
*** emacs/lisp/emacs-lisp/cl-extra.el:1.24      Sat May  3 20:44:25 2003
--- emacs/lisp/emacs-lisp/cl-extra.el   Mon Jun 16 12:35:05 2003
***************
*** 1,6 ****
  ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: 
t;-*-
  
! ;; Copyright (C) 1993,2000  Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Keywords: extensions
--- 1,6 ----
  ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: 
t;-*-
  
! ;; Copyright (C) 1993,2000,2003  Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Keywords: extensions
***************
*** 718,724 ****
                                     '((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)
                 (cl-macroexpand-all (cadr (caddr (cadddr found))) env)
               form))))
        ((memq (car form) '(defun defmacro))
--- 718,725 ----
                                     '((quote --cl-rest--)))))))
                 (list (car form) (list* 'lambda (cadadr form) body))))
           (let ((found (assq (cadr form) env)))
!            (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))