[Emacs-diffs] /srv/bzr/emacs/trunk r110513: * lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Undo last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 110513
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2012-10-11 16:36:23 -0400
message:
  * lisp/emacs-lisp/cl-lib.el (cl--defsubst-expand): Undo last change.
  * lisp/emacs-lisp/cl-macs.el (cl--defsubst-expand): Idem.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-lib.el
  lisp/emacs-lisp/cl-macs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-11 20:11:23 +0000
+++ b/lisp/ChangeLog    2012-10-11 20:36:23 +0000
@@ -1,8 +1,6 @@
 2012-10-11  Stefan Monnier  <address@hidden>
 
        * help-fns.el (describe-function-1): Handle autoloads w/o docstrings.
-       * emacs-lisp/cl-lib.el (cl--defsubst-expand): Move autoload...
-       * emacs-lisp/cl-macs.el (cl--defsubst-expand): ...here.
 
        * emacs-lisp/bytecomp.el (byte-compile-eval): Adjust to long-ago
        changes to the format of load-history.

=== modified file 'lisp/emacs-lisp/cl-lib.el'
--- a/lisp/emacs-lisp/cl-lib.el 2012-10-11 20:11:23 +0000
+++ b/lisp/emacs-lisp/cl-lib.el 2012-10-11 20:36:23 +0000
@@ -727,6 +727,10 @@
 
 ;;;###autoload
 (progn
+  ;; Make sure functions defined with cl-defsubst can be inlined even in
+  ;; packages which do not require CL.  We don't put an autoload cookie
+  ;; directly on that function, since those cookies only go to cl-loaddefs.
+  (autoload 'cl--defsubst-expand "cl-macs")
   ;; Autoload, so autoload.el and font-lock can use it even when CL
   ;; is not loaded.
   (put 'cl-defun    'doc-string-elt 3)

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2012-10-11 20:11:23 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2012-10-11 20:36:23 +0000
@@ -2595,9 +2595,6 @@
               ,(and (memq '&key args) 'cl-whole) ,unsafe ,@argns)))
        (cl-defun ,name ,args ,@body))))
 
-;; Make sure functions defined with cl-defsubst can be inlined even in
-;; packages which do not require CL.
-;;;###autoload
 (defun cl--defsubst-expand (argns body simple whole unsafe &rest argvs)
   (if (and whole (not (cl--safe-expr-p (cons 'progn argvs)))) whole
     (if (cl--simple-exprs-p argvs) (setq simple t))