mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Fix oversight in package-load-list handling.

Browse Source 
* lisp/emacs-lisp/package.el (package-compute-transaction): Handle
holding a package version to t in package-load-list.
This commit is contained in:
Daniel Hackney 2012-02-27 09:57:50 +08:00 committed by Chong Yidong
parent 530739c909
commit 8ac9e52930
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -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.

3
lisp/emacs-lisp/package.el
View File

@ -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))