Fix 2014-01-08T11:19:30Z!bzg@gnu.org

* emacs-lisp/package.el (package-installed-p): Fix my previous
commit (2014-01-08T11:19:30Z!bzg@gnu.org).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba6861cc277d56315cf87baf331b113fa737c7d6..0cf7f1a154491833da12f12f28bf6a055553f281 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-08  Bastien Guerry  <bzg@gnu.org>
+
+       * emacs-lisp/package.el (package-installed-p): Fix my previous
+       commit (revno 115918).
+
 2014-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emacs-lisp/package.el (package-delete): Only remove pkg-desc from

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 26f9c35b3e7bb12299fecbddd74a9cb89ac451f6..f22221f3dee894825830b45feb3733ff0520a0d6 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -879,14 +879,13 @@ GnuPG keyring is located under \"gnupg\" in `package-user-dir'."
   "Return true if PACKAGE, of MIN-VERSION or newer, is installed.
 MIN-VERSION should be a version list."
   (unless package--initialized (error "package.el is not yet initialized!"))
-  (when (assq package package-alist)
-    (or
-     (let ((pkg-descs (cdr (assq package package-alist))))
-       (and pkg-descs
-            (version-list-<= min-version
-                             (package-desc-version (car pkg-descs)))))
-     ;; Also check built-in packages.
-     (package-built-in-p package min-version))))
+  (or
+   (let ((pkg-descs (cdr (assq package package-alist))))
+     (and pkg-descs
+         (version-list-<= min-version
+                          (package-desc-version (car pkg-descs)))))
+   ;; Also check built-in packages.
+   (package-built-in-p package min-version)))
 
 (defun package-compute-transaction (packages requirements)
   "Return a list of packages to be installed, including PACKAGES.