emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r107443: Fix oversight in package-loa


From: Chong Yidong
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r107443: Fix oversight in package-load-list handling.
Date: Mon, 27 Feb 2012 09:57:50 +0800
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 107443
author: Daniel Hackney <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-02-27 09:57:50 +0800
message:
  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.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-02-26 19:36:59 +0000
+++ b/lisp/ChangeLog    2012-02-27 01:57:50 +0000
@@ -1,3 +1,8 @@
+2012-02-27  Daniel Hackney  <address@hidden>  (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  <address@hidden>
 
        * net/tramp.el (tramp-inodes, tramp-devices): Initialize with 0.

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2012-02-10 15:59:29 +0000
+++ b/lisp/emacs-lisp/package.el        2012-02-27 01:57:50 +0000
@@ -750,7 +750,8 @@
              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))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]