diff options
| author | Glenn Morris <rgm@gnu.org> | 2017-05-17 12:43:23 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2017-05-17 12:43:23 -0400 |
| commit | df4e105910a983f42e77828809ab50611b454905 (patch) | |
| tree | ecd07b980a557625379c53d09758837d642837b0 /lisp/emacs-lisp/autoload.el | |
| parent | f861353b684e5c40dade61f89fd1742e4226a282 (diff) | |
| download | emacs-df4e105910a983f42e77828809ab50611b454905.tar.gz | |
autoload-rubric no longer provides a feature by default
* lisp/emacs-lisp/autoload.el (autoload-rubric):
Stop providing a feature unless explicitly requested.
(autoload-find-generated-file): Update autoload-rubric call.
Diffstat (limited to 'lisp/emacs-lisp/autoload.el')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index f6b09dcf31d..8fe94013700 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -264,7 +264,7 @@ expression, in which case we want to handle forms differently." ;; problems when the file contains non-ASCII characters. (with-current-buffer (find-file-noselect (autoload-ensure-file-writeable file)) - (if (zerop (buffer-size)) (insert (autoload-rubric file))) + (if (zerop (buffer-size)) (insert (autoload-rubric file nil t))) (current-buffer)))) (defun autoload-generated-file () @@ -360,10 +360,7 @@ but adds an extra line to the output to modify `load-path'. If FEATURE is non-nil, FILE will provide a feature. FEATURE may be a string naming the feature, otherwise it will be based on -FILE's name. - -At present, a feature is in fact always provided, but this should -not be relied upon." +FILE's name." (let ((basename (file-name-nondirectory file)) (lp (if (equal type "package") (setq type "autoloads")))) (concat ";;; " basename @@ -372,15 +369,14 @@ not be relied upon." ";;; Code:\n\n" (if lp ;; `load-path' should contain only directory names. - "(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))\n \n" - (concat - ;; This is used outside of autoload.el, eg cus-dep, finder. - " \n" - "(provide '" - (if (stringp feature) - feature - (file-name-sans-extension basename)) - ")\n")) + "(add-to-list 'load-path (directory-file-name + (or (file-name-directory #$) (car load-path))))\n\n") + " \n" + ;; This is used outside of autoload.el, eg cus-dep, finder. + (if feature + (format "(provide '%s)\n" + (if (stringp feature) feature + (file-name-sans-extension basename)))) ";; Local Variables:\n" ";; version-control: never\n" ";; no-byte-compile: t\n" |