Commit 55b056ba authored by Nicolas Richard's avatar Nicolas Richard Committed by Bastien Guerry

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

install the package.

Patch by Nicolas Richard.
parent 5fd03926
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> 2013-02-06 Glenn Morris <rgm@gnu.org>
* vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links * vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
......
...@@ -1182,7 +1182,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." ...@@ -1182,7 +1182,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
(require 'lisp-mnt) (require 'lisp-mnt)
(let ((package-name (symbol-name package)) (let ((package-name (symbol-name package))
(built-in (assq package package--builtins)) (built-in (assq package package--builtins))
desc pkg-dir reqs version installable) desc pkg-dir reqs version installable archive)
(prin1 package) (prin1 package)
(princ " is ") (princ " is ")
(cond (cond
...@@ -1196,6 +1196,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." ...@@ -1196,6 +1196,7 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
;; Available packages are in `package-archive-contents'. ;; Available packages are in `package-archive-contents'.
((setq desc (cdr (assq package package-archive-contents))) ((setq desc (cdr (assq package package-archive-contents)))
(setq version (package-version-join (package-desc-vers desc)) (setq version (package-version-join (package-desc-vers desc))
archive (aref desc (- (length desc) 1))
installable t) installable t)
(if built-in (if built-in
(insert "a built-in package.\n\n") (insert "a built-in package.\n\n")
...@@ -1224,8 +1225,10 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages." ...@@ -1224,8 +1225,10 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
(installable (installable
(if built-in (if built-in
(insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face) (insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face)
" Alternate version available -- ") " Alternate version available")
(insert "Available -- ")) (insert "Available"))
(insert " from " archive)
(insert " -- ")
(let ((button-text (if (display-graphic-p) "Install" "[Install]")) (let ((button-text (if (display-graphic-p) "Install" "[Install]"))
(button-face (if (display-graphic-p) (button-face (if (display-graphic-p)
'(:box (:line-width 2 :color "dark grey") '(:box (:line-width 2 :color "dark grey")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment