[Emacs-diffs] emacs-24 r116854: Fix bug#16762

[Dmitry Gutov]

------------------------------------------------------------
revno: 116854
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/16762
committer: Dmitry Gutov <address@hidden>
branch nick: emacs-24
timestamp: Tue 2014-03-25 00:38:06 +0200
message:
  Fix bug#16762
  
  * lisp/emacs-lisp/package.el (package--add-to-archive-contents):
  Include already installed and built-in packages in
  `package-archive-contents'.
  (package-install): Don't include already installed packages in the
  options on interactive invocation.
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-03-24 20:41:08 +0000
+++ b/lisp/ChangeLog    2014-03-24 22:38:06 +0000
@@ -1,3 +1,11 @@
+2014-03-24  Dmitry Gutov  <address@hidden>
+
+       * emacs-lisp/package.el (package--add-to-archive-contents):
+       Include already installed and built-in packages in
+       `package-archive-contents'.
+       (package-install): Don't include already installed packages in the
+       options during interactive invocation.  (Bug#16762)
+
 2014-03-24  Daniel Colascione  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl--do-arglist): Use `plist-member'

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-03-23 08:35:56 +0000
+++ b/lisp/emacs-lisp/package.el        2014-03-24 22:38:06 +0000
@@ -1047,14 +1047,9 @@
          (existing-packages (assq name package-archive-contents))
          (pinned-to-archive (assoc name package-pinned-packages)))
     (cond
-     ;; Skip entirely if pinned to another archive or already installed.
-     ((or (and pinned-to-archive
-               (not (equal (cdr pinned-to-archive) archive)))
-          (let ((bi (assq name package--builtin-versions)))
-            (and bi (version-list-= version (cdr bi))))
-          (let ((ins (cdr (assq name package-alist))))
-            (and ins (version-list-= version
-                                     (package-desc-version (car ins))))))
+     ;; Skip entirely if pinned to another archive.
+     ((and pinned-to-archive
+           (not (equal (cdr pinned-to-archive) archive)))
       nil)
      ((not existing-packages)
       (push (list name pkg-desc) package-archive-contents))
@@ -1090,8 +1085,11 @@
        (package-refresh-contents))
      (list (intern (completing-read
                     "Install package: "
-                    (mapcar (lambda (elt) (symbol-name (car elt)))
-                            package-archive-contents)
+                    (delq nil
+                          (mapcar (lambda (elt)
+                                    (unless (package-installed-p (car elt))
+                                      (symbol-name (car elt))))
+                                  package-archive-contents))
                     nil t)))))
   (package-download-transaction
    (if (package-desc-p pkg)