[Emacs-diffs] trunk r113021: lisp/startup.el: Fix bug#14639.

[Juanma Barranquero]

------------------------------------------------------------
revno: 113021
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14639
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-17 17:33:52 +0200
message:
  lisp/startup.el: Fix bug#14639.
   (command-line): Expand package name returned by `package--description-file'.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/startup.el                startup.el-20091113204419-o5vbwnq5f7feedwu-260

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-17 06:24:08 +0000
+++ b/lisp/ChangeLog    2013-06-17 15:33:52 +0000
@@ -1,3 +1,8 @@
+2013-06-17  Juanma Barranquero  <address@hidden>
+
+       * startup.el (command-line): Expand package name returned by
+       `package--description-file' (bug#14639).
+
 2013-06-17  Dmitry Gutov  <address@hidden>
 
        * emacs-lisp/package.el (package-load-descriptor): Do not call

=== modified file 'lisp/startup.el'
--- a/lisp/startup.el   2013-06-15 15:36:11 +0000
+++ b/lisp/startup.el   2013-06-17 15:33:52 +0000
@@ -1203,7 +1203,9 @@
                 (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))