From 8ac9e52930219a1621e59aafcf7b30d97c325702 Mon Sep 17 00:00:00 2001 From: Daniel Hackney Date: Mon, 27 Feb 2012 09:57:50 +0800 Subject: [PATCH] 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. --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 76a7ccfe753..57ae84c0fff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-02-27 Daniel Hackney (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 * 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 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)) -- 2.39.2