* emacs-lisp/package.el (describe-package-1): Tell what archive is used to

install the package.

Patch by Nicolas Richard.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96c390b2aeb448cd85b9125331cab04c54f0d5bf..f87bdddacda799c87a2d6260ac5a1b3444f08c1b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-06  Nicolas Richard <theonewiththeevillook@yahoo.fr>  (tiny change)
+
+       * emacs-lisp/package.el (describe-package-1): Tell what archive is
+       used to install the package.
+
 2013-02-06  Glenn Morris  <rgm@gnu.org>
 
        * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 6059f03f9993b3b163021f3d708893a2966ea2e8..dd828691158e4d838c893412e4a319f1a8e91964 100644 (file)
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1182,7 +1182,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
   (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 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
      ;; 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 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
          (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")