diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2013-06-17 17:33:52 +0200 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2013-06-17 17:33:52 +0200 |
| commit | 551e07e5f5baf57eaa103a4660ccad85a1f8046c (patch) | |
| tree | 5a5859d3b8afa53a480570d68753de77db3fe094 | |
| parent | 708e05f6d1b39313a63e34a5b4e1a16ae809ae25 (diff) | |
| download | emacs-551e07e5f5baf57eaa103a4660ccad85a1f8046c.tar.gz | |
lisp/startup.el: Fix bug#14639.
(command-line): Expand package name returned by `package--description-file'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 4 |
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 @@ +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)) |