package.el: various fixes.

* emacs-lisp/package.el (package-installed-p): First check if the
package name is in package-alist.
(package-delete): Correctly delete the package from package-alist.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ff78a4ca5fbf3272b2139a1f02a346ada1c9842..a39294ac54dbed5b884582d5bbec69ba751dd0f0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-08  Bastien Guerry  <bzg@gnu.org>
+
+       * emacs-lisp/package.el (package-installed-p): First check if the
+       package name is in package-alist.
+       (package-delete): Correctly delete the package from package-alist.
+
 2014-01-08  Daiki Ueno  <ueno@gnu.org>
 
        * emacs-lisp/package.el (url-recreate-url): Declare.

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 64a9eff916ae1b29ee8ac3152c195df2e438cb07..a89bf40eb441b862c42e2ae4dc26f0d0fa0cd7ab 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -881,13 +881,14 @@ 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)))
+     (package-built-in-p package min-version))))
 
 (defun package-compute-transaction (packages requirements)
   "Return a list of packages to be installed, including PACKAGES.
@@ -1232,7 +1233,7 @@ The file can either be a tar file or an Emacs Lisp file."
            (delete-file signed-file)))
       ;; Update package-alist.
       (let* ((name (package-desc-name pkg-desc)))
-       (delete (delete pkg-desc (assq name package-alist)) package-alist))
+       (setq package-alist (delete (assq name package-alist) package-alist)))
       (message "Package `%s' deleted." (package-desc-full-name pkg-desc)))))
 
 (defun package-archive-base (desc)