[Emacs-diffs] trunk r115920: Fix revno 115918

[Bastien Guerry]

------------------------------------------------------------
revno: 115920
revision-id: address@hidden
parent: address@hidden
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-08 18:39:31 +0100
message:
  Fix revno 115918
  
  * emacs-lisp/package.el (package-installed-p): Fix my previous
  commit (revno 115918).
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-08 14:19:27 +0000
+++ b/lisp/ChangeLog    2014-01-08 17:39:31 +0000
@@ -1,3 +1,8 @@
+2014-01-08  Bastien Guerry  <address@hidden>
+
+       * emacs-lisp/package.el (package-installed-p): Fix my previous
+       commit (revno 115918).
+
 2014-01-08  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/package.el (package-delete): Only remove pkg-desc from

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-01-08 14:19:27 +0000
+++ b/lisp/emacs-lisp/package.el        2014-01-08 17:39:31 +0000
@@ -879,14 +879,13 @@
   "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.