summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorDaniel Hackney <dan@haxney.org>2012-02-27 09:57:50 +0800
committerChong Yidong <cyd@gnu.org>2012-02-27 09:57:50 +0800
commit8ac9e52930219a1621e59aafcf7b30d97c325702 (patch)
tree906a5cdf1cc0b886c7a76d8b19a4d773aa070371 /lisp/emacs-lisp
parent530739c9095230eed623d69f04b6ceec8c917da7 (diff)
downloademacs-8ac9e52930219a1621e59aafcf7b30d97c325702.tar.gz
emacs-8ac9e52930219a1621e59aafcf7b30d97c325702.tar.bz2
emacs-8ac9e52930219a1621e59aafcf7b30d97c325702.zip
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.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/package.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index d80454ba269..ff4fbe3ead4 100644
--- 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))