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

statement.

2 files changed, 10 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 380f208b2b1..2ac43c58125 100644
--- 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 f15863f2631..5171d142c24 100644
--- 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"
             "\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"