diff options
| author | Nicolas Richard <theonewiththeevillook@yahoo.fr> | 2013-02-06 17:10:13 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2013-02-06 17:10:13 +0100 |
| commit | 55b056bacf43ae3daeebe484911ef3c8acbc9516 (patch) | |
| tree | 11aaf691815b5591052a2c9921f1fced9d04f321 /lisp | |
| parent | 5fd03926b34b26255bbde9dc1696183625f8be03 (diff) | |
| download | emacs-55b056bacf43ae3daeebe484911ef3c8acbc9516.tar.gz | |
* emacs-lisp/package.el (describe-package-1): Tell what archive is used to
install the package.
Patch by Nicolas Richard.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/emacs-lisp/package.el | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96c390b2aeb..f87bdddacda 100644 --- 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 6059f03f999..dd828691158 100644 --- 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") |