lisp/startup.el: Fix bug#14639.

 (command-line): Expand package name returned by `package--description-file'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6474555..ccc9042 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-17  Juanma Barranquero  <lekktu@gmail.com>
+
+       * startup.el (command-line): Expand package name returned by
+       `package--description-file' (bug#14639).
+
 2013-06-17  Dmitry Gutov  <dgutov@yandex.ru>
 
        * emacs-lisp/package.el (package-load-descriptor): Do not call

diff --git a/lisp/startup.el b/lisp/startup.el
index 52dd6b0..77b2bce 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1203,7 +1203,9 @@ the `--debug-init' option to view a complete error backtrace."
                 (when (let ((subdir (expand-file-name subdir dir)))
                          (and (file-directory-p subdir)
                               (file-exists-p
-                               (package--description-file subdir))))
+                               (expand-file-name
+                                (package--description-file subdir)
+                                subdir))))
                   (throw 'package-dir-found t)))))))
        (package-initialize))