Move two more variables from autoload.el to loaddefs-gen.el

* lisp/emacs-lisp/loaddefs-gen.el (generated-autoload-file)
(generated-autoload-load-name): Move the remaining two autoload.el
variables used by loaddefs-gen.el from autoload.el.
This commit is contained in:
Lars Ingebrigtsen 2022-06-05 20:32:01 +02:00
parent 3406e4064f
commit 8c00e21df2
2 changed files with 25 additions and 25 deletions

View file

@ -38,31 +38,6 @@
(require 'cl-lib)
(require 'loaddefs-gen)
(defvar generated-autoload-file nil
"File into which to write autoload definitions.
A Lisp file can set this in its local variables section to make
its autoloads go somewhere else.
If this is a relative file name, the directory is determined as
follows:
- If a Lisp file defined `generated-autoload-file' as a
file-local variable, use its containing directory.
- Otherwise use the \"lisp\" subdirectory of `source-directory'.
The autoload file is assumed to contain a trailer starting with a
FormFeed character.")
;;;###autoload
(put 'generated-autoload-file 'safe-local-variable 'stringp)
(defvar generated-autoload-load-name nil
"Load name for `autoload' statements generated from autoload cookies.
If nil, this defaults to the file name, sans extension.
Typically, you need to set this when the directory containing the file
is not in `load-path'.
This also affects the generated cus-load.el file.")
;;;###autoload
(put 'generated-autoload-load-name 'safe-local-variable 'stringp)
;; This feels like it should be a defconst, but MH-E sets it to
;; ";;;###mh-autoload" for the autoloads that are to go into mh-loaddefs.el.
(defvar generate-autoload-cookie ";;;###autoload"

View file

@ -65,6 +65,31 @@ be included.")
More specifically those definitions will not be considered for the
`register-definition-prefixes' call.")
(defvar generated-autoload-file nil
"File into which to write autoload definitions.
A Lisp file can set this in its local variables section to make
its autoloads go somewhere else.
If this is a relative file name, the directory is determined as
follows:
- If a Lisp file defined `generated-autoload-file' as a
file-local variable, use its containing directory.
- Otherwise use the \"lisp\" subdirectory of `source-directory'.
The autoload file is assumed to contain a trailer starting with a
FormFeed character.")
;;;###autoload
(put 'generated-autoload-file 'safe-local-variable 'stringp)
(defvar generated-autoload-load-name nil
"Load name for `autoload' statements generated from autoload cookies.
If nil, this defaults to the file name, sans extension.
Typically, you need to set this when the directory containing the file
is not in `load-path'.
This also affects the generated cus-load.el file.")
;;;###autoload
(put 'generated-autoload-load-name 'safe-local-variable 'stringp)
(defun loaddefs-generate--file-load-name (file outfile)
"Compute the name that will be used to load FILE.
OUTFILE should be the name of the global loaddefs.el file, which