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

[Stefan Monnier]

Index: emacs/lisp/emacs-lisp/autoload.el
diff -c emacs/lisp/emacs-lisp/autoload.el:1.97 
emacs/lisp/emacs-lisp/autoload.el:1.98
*** emacs/lisp/emacs-lisp/autoload.el:1.97      Sun May  4 20:23:34 2003
--- emacs/lisp/emacs-lisp/autoload.el   Thu May 15 11:24:24 2003
***************
*** 1,6 ****
  ;; autoload.el --- maintain autoloads in loaddefs.el
  
! ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Roland McGrath <address@hidden>
--- 1,6 ----
  ;; autoload.el --- maintain autoloads in loaddefs.el
  
! ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2003
  ;;   Free Software Foundation, Inc.
  
  ;; Author: Roland McGrath <address@hidden>
***************
*** 34,39 ****
--- 34,40 ----
  
  (require 'lisp-mode)                  ;for `doc-string-elt' properties.
  (require 'help-fns)                   ;for help-add-fundoc-usage.
+ (eval-when-compile (require 'cl))
  
  (defvar generated-autoload-file "loaddefs.el"
     "*File \\[update-file-autoloads] puts autoloads into.
***************
*** 90,97 ****
                   define-minor-mode defun* defmacro*))
        (let* ((macrop (memq car '(defmacro defmacro*)))
             (name (nth 1 form))
!            (args (if (memq car '(defun defmacro defun* defmacro*))
!                      (nth 2 form) t))
             (body (nthcdr (get car 'doc-string-elt) form))
             (doc (if (stringp (car body)) (pop body))))
        (when (listp args)
--- 91,101 ----
                   define-minor-mode defun* defmacro*))
        (let* ((macrop (memq car '(defmacro defmacro*)))
             (name (nth 1 form))
!            (args (case car
!                   ((defun defmacro defun* defmacro*) (nth 2 form))
!                   ((define-skeleton) '(&optional str arg))
!                   ((define-generic-mode define-derived-mode) nil)
!                   (t)))
             (body (nthcdr (get car 'doc-string-elt) form))
             (doc (if (stringp (car body)) (pop body))))
        (when (listp args)