diff options
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b207deea0de..16590271ec4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-12-18 Dmitry Gutov <dgutov@yandex.ru> | ||
| 2 | |||
| 3 | * emacs-lisp/package.el (package-activate): Do not re-activate or | ||
| 4 | reload the dependencies (bug#19390). | ||
| 5 | |||
| 1 | 2014-12-18 Stefan Monnier <monnier@iro.umontreal.ca> | 6 | 2014-12-18 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 7 | ||
| 3 | * progmodes/cc-cmds.el (c-subword-mode): Alias to subword-mode. | 8 | * progmodes/cc-cmds.el (c-subword-mode): Alias to subword-mode. |
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 1949d0d474c..11333ec3d78 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el | |||
| @@ -642,7 +642,7 @@ If FORCE is true, (re-)activate it if it's already activated." | |||
| 642 | (fail (catch 'dep-failure | 642 | (fail (catch 'dep-failure |
| 643 | ;; Activate its dependencies recursively. | 643 | ;; Activate its dependencies recursively. |
| 644 | (dolist (req (package-desc-reqs pkg-vec)) | 644 | (dolist (req (package-desc-reqs pkg-vec)) |
| 645 | (unless (package-activate (car req) force) | 645 | (unless (package-activate (car req)) |
| 646 | (throw 'dep-failure req)))))) | 646 | (throw 'dep-failure req)))))) |
| 647 | (if fail | 647 | (if fail |
| 648 | (warn "Unable to activate package `%s'. | 648 | (warn "Unable to activate package `%s'. |