* emacs-lisp/autoload.el (autoload-rubric): Always issue a provide

statement.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 380f208b2b1e8637328e6cd4c3c6ea285d52f7b6..2ac43c5812595f66b1b72b7106647fd7ba7d9ac5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-06  Chong Yidong  <cyd@stupidchicken.com>
+
+       * emacs-lisp/autoload.el (autoload-rubric): Always issue a provide
+       statement.
+
 2009-11-05  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * progmodes/ld-script.el (auto-mode-alist):

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index f15863f2631422ab3d4521618ddc332e2add72de..5171d142c248840b9478be8fb2f715ed07c99f41 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -266,12 +266,11 @@ feature, otherwise it will be based on FILE's name."
            ";;; Code:\n\n"
            "\f\n"
            ;; This is used outside of autoload.el.
-           (if feature
-               (concat "(provide '"
-                       (if (stringp feature) feature
-                         (file-name-sans-extension basename))
-                       ")\n")
-             "")
+           "(provide '"
+           (if (stringp feature)
+               feature
+             (file-name-sans-extension basename))
+           ")\n"
            ";; Local Variables:\n"
            ";; version-control: never\n"
            ";; no-byte-compile: t\n"