Fix oversight in package-load-list handling.

* lisp/emacs-lisp/package.el (package-compute-transaction): Handle
holding a package version to t in package-load-list.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76a7ccfe753f65092ad058e138e21993f017639e..57ae84c0fff8dc2c63e02ac5ac4e965e93f3fba3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27  Daniel Hackney  <dan@haxney.org>  (tiny change)
+
+       * emacs-lisp/package.el (package-compute-transaction): Handle
+       holding a package version to t in package-load-list.
+
 2012-02-26  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-inodes, tramp-devices): Initialize with 0.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d80454ba269caa53498136b7a881690eeb3a7d15..ff4fbe3ead484200c93d13e90e4c987f75756014 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -750,7 +750,8 @@ not included in this list."
              hold)
          (when (setq hold (assq next-pkg package-load-list))
            (setq hold (cadr hold))
-           (cond ((eq hold nil)
+           (cond ((eq hold t))
+                 ((eq hold nil)
                   (error "Required package '%s' is disabled"
                          (symbol-name next-pkg)))
                  ((null (stringp hold))