[Emacs-diffs] /srv/bzr/emacs/trunk r112403: * lisp/emacs-lisp/package.el (package-autoload-ensure-default-file):

[Stefan Monnier]

------------------------------------------------------------
revno: 112403
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sat 2013-04-27 09:32:53 -0400
message:
  * lisp/emacs-lisp/package.el (package-autoload-ensure-default-file):
  Add current dir to the load-path.
  (package-generate-autoloads): Don't rely on autoload-ensure-default-file.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-04-27 06:38:41 +0000
+++ b/lisp/ChangeLog    2013-04-27 13:32:53 +0000
@@ -1,3 +1,10 @@
+2013-04-27  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/package.el (package-autoload-ensure-default-file):
+       Add current dir to the load-path.
+       (package-generate-autoloads): Don't rely on
+       autoload-ensure-default-file.
+
 2013-04-26  Reuben Thomas  <address@hidden>
 
        * textmodes/remember.el (remember-store-in-files): Document that

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-04-05 18:46:59 +0000
+++ b/lisp/emacs-lisp/package.el        2013-04-27 13:32:53 +0000
@@ -588,7 +588,8 @@
      (concat ";;; " (file-name-nondirectory file)
             " --- automatically extracted autoloads\n"
             ";;\n"
-            ";;; Code:\n\n"
+            ";;; Code:\n"
+             "(add-to-list 'load-path (or (file-name-directory #$) (car 
load-path)))\n"
             "\n;; Local Variables:\n"
             ";; version-control: never\n"
             ";; no-byte-compile: t\n"
@@ -605,8 +606,7 @@
         ;;(ignore-name (concat name "-pkg.el"))
         (generated-autoload-file (expand-file-name auto-name pkg-dir))
         (version-control 'never))
-    (unless (fboundp 'autoload-ensure-default-file)
-      (package-autoload-ensure-default-file generated-autoload-file))
+    (package-autoload-ensure-default-file generated-autoload-file)
     (update-directory-autoloads pkg-dir)
     (let ((buf (find-buffer-visiting generated-autoload-file)))
       (when buf (kill-buffer buf)))))