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

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/cl-macs.el
diff -c emacs/lisp/emacs-lisp/cl-macs.el:1.41 
emacs/lisp/emacs-lisp/cl-macs.el:1.42
*** emacs/lisp/emacs-lisp/cl-macs.el:1.41       Mon Jun 16 12:31:29 2003
--- emacs/lisp/emacs-lisp/cl-macs.el    Fri Jul  4 20:23:04 2003
***************
*** 1,6 ****
  ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
  
! ;; Copyright (C) 1993 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Version: 2.02
--- 1,6 ----
  ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
  
! ;; Copyright (C) 1993, 2003 Free Software Foundation, Inc.
  
  ;; Author: Dave Gillespie <address@hidden>
  ;; Version: 2.02
***************
*** 266,272 ****
             (nconc (let ((hdr (nreverse header)))
                      (require 'help-fns)
                      (cons (help-add-fundoc-usage
!                            (if (stringp (car hdr)) (pop hdr)) orig-args)
                            hdr))
                    (list (nconc (list 'let* bind-lets)
                                 (nreverse bind-forms) body)))))))
--- 266,277 ----
             (nconc (let ((hdr (nreverse header)))
                      (require 'help-fns)
                      (cons (help-add-fundoc-usage
!                            (if (stringp (car hdr)) (pop hdr))
!                            ;; orig-args can contain &cl-defs (an internal CL
!                            ;; thingy that I do not understand), so remove it.
!                            (let ((x (memq '&cl-defs orig-args)))
!                              (if (null x) orig-args
!                                (delq (car x) (remq (cadr x) orig-args)))))
                            hdr))
                    (list (nconc (list 'let* bind-lets)
                                 (nreverse bind-forms) body)))))))