From 2167f25d0fb342b9a2c648127208fd9c18f88ee3 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Wed, 8 Jan 2014 18:39:31 +0100 Subject: [PATCH] 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). --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/package.el | 15 +++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba6861cc27..0cf7f1a154 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-01-08 Bastien Guerry + + * emacs-lisp/package.el (package-installed-p): Fix my previous + commit (revno 115918). + 2014-01-08 Stefan Monnier * 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 26f9c35b3e..f22221f3de 100644 --- 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. -- 2.20.1