diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 18:29:30 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-03-01 18:29:30 -0800 |
| commit | 9d6b4d53469a9ffd67bd770fabc6fe254e35c21d (patch) | |
| tree | de238c6f707915be9ed1f10235589b4e975a08fb /lisp/emacs-lisp/package.el | |
| parent | a89654f8f34114db543cb91363e8fded6d73e986 (diff) | |
| parent | eec1549a6b89359b6d970f14dead275e59b7bc6f (diff) | |
| download | emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.tar.gz emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.tar.bz2 emacs-9d6b4d53469a9ffd67bd770fabc6fe254e35c21d.zip | |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/package.el')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 3 |
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)) |