aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-17 17:33:52 +0200
committerJuanma Barranquero2013-06-17 17:33:52 +0200
commit551e07e5f5baf57eaa103a4660ccad85a1f8046c (patch)
tree5a5859d3b8afa53a480570d68753de77db3fe094
parent708e05f6d1b39313a63e34a5b4e1a16ae809ae25 (diff)
downloademacs-551e07e5f5baf57eaa103a4660ccad85a1f8046c.tar.gz
emacs-551e07e5f5baf57eaa103a4660ccad85a1f8046c.zip
lisp/startup.el: Fix bug#14639.
(command-line): Expand package name returned by `package--description-file'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/startup.el4
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 64745559126..ccc90427de2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-06-17 Juanma Barranquero <lekktu@gmail.com>
2
3 * startup.el (command-line): Expand package name returned by
4 `package--description-file' (bug#14639).
5
12013-06-17 Dmitry Gutov <dgutov@yandex.ru> 62013-06-17 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * emacs-lisp/package.el (package-load-descriptor): Do not call 8 * 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."
1203 (when (let ((subdir (expand-file-name subdir dir))) 1203 (when (let ((subdir (expand-file-name subdir dir)))
1204 (and (file-directory-p subdir) 1204 (and (file-directory-p subdir)
1205 (file-exists-p 1205 (file-exists-p
1206 (package--description-file subdir)))) 1206 (expand-file-name
1207 (package--description-file subdir)
1208 subdir))))
1207 (throw 'package-dir-found t))))))) 1209 (throw 'package-dir-found t)))))))
1208 (package-initialize)) 1210 (package-initialize))
1209 1211