scratch/faster-loaddefs 8995722a46 2/2: Rename to loaddefs-gen-batch for regularity

[Lars Ingebrigtsen]

branch: scratch/faster-loaddefs
commit 8995722a4635cb02be0f1bdec872e869d4d604c3
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Rename to loaddefs-gen-batch for regularity
---
 lisp/Makefile.in                |  8 ++------
 lisp/cedet/ede/proj-elisp.el    |  3 +--
 lisp/emacs-lisp/loaddefs-gen.el | 13 ++++++++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 356201b5ef..b3598c35d1 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -179,17 +179,13 @@ $(lisp)/finder-inf.el:
 # We make $(lisp)/loaddefs.el a dependency of .PHONY to cause Make to
 # ignore its time stamp.  That's because the real dependencies of
 # loaddefs.el aren't known to Make, they are implemented in
-# batch-update-autoloads, which only updates the autoloads whose
-# sources have changed.
-
-# Use expand-file-name rather than $abs_scrdir so that Emacs does not
-# get confused when it compares file-names for equality.
+# loaddefs-gen-batch.
 
 autoloads .PHONY: $(lisp)/loaddefs.el
 $(lisp)/loaddefs.el: gen-lisp $(LOADDEFS)
        $(AM_V_GEN)$(emacs) -l autoload \
             -l $(lisp)/emacs-lisp/loaddefs-gen.elc \
-           -f batch-loaddefs-gen ${SUBDIRS_ALMOST}
+           -f loaddefs-gen-batch $(lisp)/loaddefs.el ${SUBDIRS_ALMOST}
 
 # autoloads only runs when loaddefs.el is nonexistent, although it
 # generates a number of different files. Provide a force option to enable
diff --git a/lisp/cedet/ede/proj-elisp.el b/lisp/cedet/ede/proj-elisp.el
index 0c65af15c4..ba86a1cd2e 100644
--- a/lisp/cedet/ede/proj-elisp.el
+++ b/lisp/cedet/ede/proj-elisp.el
@@ -319,8 +319,7 @@ Lays claim to all .elc files that match .el files in this 
target."
                ("require" . "$(foreach r,$(1),(require (quote $(r))))"))
    :commands
    '("$(EMACS) $(EMACSFLAGS) $(addprefix -L ,$(LOADPATH)) \
---eval '(setq generated-autoload-file \"$(abspath $(LOADDEFS))\")' \
--f batch-update-autoloads $(abspath $(LOADDIRS))")
+-f loaddefs-gen-batch $(abspath $(LOADDEFS)) $(abspath $(LOADDIRS))")
    :rules (list (ede-makefile-rule :target "clean-autoloads" :phony t :rules 
'("rm -f $(LOADDEFS)")))
    :sourcetype '(ede-source-emacs)
    )
diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index be7bc585ce..e6c908f05a 100644
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -544,7 +544,7 @@ directory or directories specified."
           (let ((relfile (file-relative-name
                           (cadar section)
                           (file-name-directory (car fdefs)))))
-            (insert ";;; Generated autoloads from " relfile "\n")
+            (insert "\f\n;;; Generated autoloads from " relfile "\n")
             (dolist (def (reverse section))
               (setq def (caddr def))
               (if (stringp def)
@@ -566,7 +566,8 @@ directory or directories specified."
     ;; The salient point here is that we have to have the doc string
     ;; that starts with a backslash and a newline, and there mustn't
     ;; be any newlines before that.  So -- typically
-    ;; (defvar foo 'value "Doc string" ...).
+    ;; (defvar foo 'value "\
+    ;; Doc string" ...).
     (insert "(")
     (dotimes (_ 3)
       (prin1 (pop def) (current-buffer)
@@ -602,13 +603,15 @@ directory or directories specified."
     (cons (expand-file-name "ldefs-boot.el") excludes)))
 
 ;;;###autoload
-(defun batch-loaddefs-gen ()
-  "Generate lisp/loaddefs.el autoloads in batch mode."
+(defun loaddefs-gen-batch ()
+  "Generate lisp/loaddefs.el autoloads in batch mode.
+The first element on the command line should be the (main)
+loaddefs.el file, and the rest are the directories to use."
   ;; For use during the Emacs build process only.
   (let ((args command-line-args-left))
     (setq command-line-args-left nil)
     (loaddefs-gen--generate
-     args (expand-file-name "loaddefs.el" lisp-directory)
+     (cdr args) (expand-file-name (car args) lisp-directory)
      (loaddefs-gen--excluded-files))))
 
 (provide 'loaddefs-gen)