[Emacs-diffs] master 36c43e9: Fixes: debbugs:19390

[Dmitry Gutov]

branch: master
commit 36c43e95de5e067b7d6a06db479765b4e4a22986
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>

    Fixes: debbugs:19390
    
    * lisp/emacs-lisp/package.el (package-activate): Do not re-activate or
    reload the dependencies.
---
 lisp/ChangeLog             |    5 +++++
 lisp/emacs-lisp/package.el |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b207dee..1659027 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-18  Dmitry Gutov  <address@hidden>
+
+       * emacs-lisp/package.el (package-activate): Do not re-activate or
+       reload the dependencies (bug#19390).
+
 2014-12-18  Stefan Monnier  <address@hidden>
 
        * 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 1949d0d..11333ec 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."
              (fail (catch 'dep-failure
                      ;; Activate its dependencies recursively.
                      (dolist (req (package-desc-reqs pkg-vec))
-                       (unless (package-activate (car req) force)
+                       (unless (package-activate (car req))
                          (throw 'dep-failure req))))))
        (if fail
            (warn "Unable to activate package `%s'.