diff options
| author | Bastien Guerry <bzg@gnu.org> | 2014-01-08 18:39:31 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2014-01-08 18:39:31 +0100 |
| commit | 2167f25d0fb342b9a2c648127208fd9c18f88ee3 (patch) | |
| tree | bb6b7a22f246b366b279a99b9bb34f21516513e1 | |
| parent | ec6c7de2395a9613c173b912f0b4895cd17f3caf (diff) | |
| download | emacs-2167f25d0fb342b9a2c648127208fd9c18f88ee3.tar.gz | |
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).
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ba6861cc277..0cf7f1a1544 100644 --- 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 26f9c35b3e7..f22221f3dee 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. |