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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/06/27 19:17:54

Index: emacs-lisp/cl.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/cl.el,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- emacs-lisp/cl.el    21 Jan 2007 02:44:24 -0000      1.54
+++ emacs-lisp/cl.el    27 Jun 2007 19:17:53 -0000      1.55
@@ -585,68 +585,15 @@
 
 ;;; Miscellaneous.
 
-(defvar cl-fake-autoloads nil
-  "Non-nil means don't make CL functions autoload.")
-
 ;;; Autoload the other portions of the package.
 ;; We want to replace the basic versions of dolist, dotimes, declare below.
 (fmakunbound 'dolist)
 (fmakunbound 'dotimes)
 (fmakunbound 'declare)
-(mapcar (function
-        (lambda (set)
-          (let ((file (if cl-fake-autoloads "<none>" (car set))))
-            (mapcar (function
-                     (lambda (func)
-                       (autoload func (car set) nil nil (nth 1 set))))
-                    (cddr set)))))
-       '(("cl-extra" nil
-          coerce equalp cl-map-keymap maplist mapc mapl mapcan mapcon
-          cl-map-keymap cl-map-keymap-recursively cl-map-intervals
-          cl-map-overlays cl-set-frame-visible-p cl-float-limits
-          gcd lcm isqrt floor* ceiling* truncate* round*
-          mod* rem* signum random* make-random-state random-state-p
-          subseq concatenate cl-mapcar-many map some every notany
-          notevery revappend nreconc list-length tailp copy-tree get* getf
-          cl-set-getf cl-do-remf remprop cl-make-hash-table cl-hash-lookup
-          cl-gethash cl-puthash cl-remhash cl-clrhash cl-maphash 
cl-hash-table-p
-          cl-hash-table-count cl-progv-before cl-prettyexpand
-          cl-macroexpand-all)
-         ("cl-seq" nil
-          reduce fill replace remove* remove-if remove-if-not
-          delete* delete-if delete-if-not remove-duplicates
-          delete-duplicates substitute substitute-if substitute-if-not
-          nsubstitute nsubstitute-if nsubstitute-if-not find find-if
-          find-if-not position position-if position-if-not count count-if
-          count-if-not mismatch search sort* stable-sort merge member*
-          member-if member-if-not cl-adjoin assoc* assoc-if assoc-if-not
-          rassoc* rassoc-if rassoc-if-not union nunion intersection
-          nintersection set-difference nset-difference set-exclusive-or
-          nset-exclusive-or subsetp subst-if subst-if-not nsubst nsubst-if
-          nsubst-if-not sublis nsublis tree-equal)
-         ("cl-macs" nil
-          gensym gentemp typep cl-do-pop get-setf-method
-          cl-struct-setf-expander compiler-macroexpand cl-compile-time-init)
-         ("cl-macs" t
-          defun* defmacro* function* destructuring-bind eval-when
-          load-time-value case ecase typecase etypecase
-          block return return-from loop do do* dolist dotimes do-symbols
-          do-all-symbols psetq progv flet labels macrolet symbol-macrolet
-          lexical-let lexical-let* multiple-value-bind multiple-value-setq
-          locally the declare define-setf-method defsetf define-modify-macro
-          setf psetf remf shiftf rotatef letf letf* callf callf2 defstruct
-          check-type assert ignore-errors define-compiler-macro)))
+(load "cl-loaddefs")
 
 ;;; Define data for indentation and edebug.
-(mapcar (function
-        (lambda (entry)
-          (mapcar (function
-                   (lambda (func)
-                     (put func 'lisp-indent-function (nth 1 entry))
-                     (put func 'lisp-indent-hook (nth 1 entry))
-                     (or (get func 'edebug-form-spec)
-                         (put func 'edebug-form-spec (nth 2 entry)))))
-                  (car entry))))
+(dolist (entry
        '(((defun* defmacro*) 2)
          ((function*) nil
           (&or symbolp ([&optional 'macro] 'lambda (&rest sexp) &rest form)))
@@ -675,6 +622,11 @@
          ((callf2) 3 (sexp form form &rest form))
          ((loop) nil (&rest &or symbolp form))
          ((ignore-errors) 0 (&rest form))))
+  (dolist (func (car entry))
+    (put func 'lisp-indent-function (nth 1 entry))
+    (put func 'lisp-indent-hook (nth 1 entry))
+    (or (get func 'edebug-form-spec)
+        (put func 'edebug-form-spec (nth 2 entry)))))
 
 
 ;;; This goes here so that cl-macs can find it if it loads right now.