[Emacs-diffs] /srv/bzr/emacs/trunk r111684: * emacs-lisp/package.el (describe-package-1): Tell what archive is used to

[Bastien Guerry]

------------------------------------------------------------
revno: 111684
author: Nicolas Richard <address@hidden>
committer: Bastien Guerry <address@hidden>
branch nick: trunk
timestamp: Wed 2013-02-06 17:10:13 +0100
message:
  * emacs-lisp/package.el (describe-package-1): Tell what archive is used to
  install the package.
  
  Patch by Nicolas Richard.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/package.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-06 08:27:41 +0000
+++ b/lisp/ChangeLog    2013-02-06 16:10:13 +0000
@@ -1,3 +1,8 @@
+2013-02-06  Nicolas Richard <address@hidden>  (tiny change)
+
+       * emacs-lisp/package.el (describe-package-1): Tell what archive is
+       used to install the package.
+
 2013-02-06  Glenn Morris  <address@hidden>
 
        * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2013-01-01 09:11:05 +0000
+++ b/lisp/emacs-lisp/package.el        2013-02-06 16:10:13 +0000
@@ -1182,7 +1182,7 @@
   (require 'lisp-mnt)
   (let ((package-name (symbol-name package))
        (built-in (assq package package--builtins))
-       desc pkg-dir reqs version installable)
+       desc pkg-dir reqs version installable archive)
     (prin1 package)
     (princ " is ")
     (cond
@@ -1196,6 +1196,7 @@
      ;; Available packages are in `package-archive-contents'.
      ((setq desc (cdr (assq package package-archive-contents)))
       (setq version (package-version-join (package-desc-vers desc))
+           archive (aref desc (- (length desc) 1))
            installable t)
       (if built-in
          (insert "a built-in package.\n\n")
@@ -1224,8 +1225,10 @@
          (installable
           (if built-in
               (insert (propertize "Built-in." 'font-lock-face 
'font-lock-builtin-face)
-                      "  Alternate version available -- ")
-            (insert "Available -- "))
+                      "  Alternate version available")
+            (insert "Available"))
+          (insert " from " archive)
+          (insert " -- ")
           (let ((button-text (if (display-graphic-p) "Install" "[Install]"))
                 (button-face (if (display-graphic-p)
                                  '(:box (:line-width 2 :color "dark grey")