From: Juanma Barranquero <lekktu@gmail.com>
Date: Mon, 17 Jun 2013 15:33:52 +0000 (+0200)
Subject: lisp/startup.el: Fix bug#14639.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2016^2~73^2~27
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=551e07e5f5baf57eaa103a4660ccad85a1f8046c;p=emacs.git

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 64745559126..ccc90427de2 100644
--- 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 52dd6b074ba..77b2bcec5b7 100644
--- 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))