diff options
| author | Daniel Hackney <dan@haxney.org> | 2012-02-27 09:57:50 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-02-27 09:57:50 +0800 |
| commit | 8ac9e52930219a1621e59aafcf7b30d97c325702 (patch) | |
| tree | 906a5cdf1cc0b886c7a76d8b19a4d773aa070371 | |
| parent | 530739c9095230eed623d69f04b6ceec8c917da7 (diff) | |
| download | emacs-8ac9e52930219a1621e59aafcf7b30d97c325702.tar.gz | |
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.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
2 files changed, 7 insertions, 1 deletions
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 <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 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)) |