diff options
| author | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-04-12 15:11:08 +0100 |
|---|---|---|
| committer | Artur Malabarba <bruce.connor.am@gmail.com> | 2015-04-12 16:16:06 +0100 |
| commit | e99d8cb25db2d1306be011ecccd85845e41ccec8 (patch) | |
| tree | f8849be381273a14d6704e899cb81b420da83426 /lisp | |
| parent | 5aa0dfe4b73c0ef1a8462410265a29c55e244879 (diff) | |
| download | emacs-e99d8cb25db2d1306be011ecccd85845e41ccec8.tar.gz | |
* lisp/emacs-lisp/package.el: Improve transaction y-or-n prompt
(package-menu--prompt-transaction-p): Prompt for "Delete" first,
"Upgrade" last, and use capitalized instead of all-caps.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/emacs-lisp/package.el | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 92d71bae222..6fb5ba45468 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2780,15 +2780,15 @@ nil, but not both." (del (cl-set-difference delete upg :key #'package-desc-name))) (y-or-n-p (concat - (when upg "UPGRADE ") - (package-menu--list-to-prompt upg) - (when (and upg ins) - (if del "; " "; and ")) - (when ins "INSTALL ") - (package-menu--list-to-prompt ins) - (when (and del (or ins upg)) "; and ") - (when del "DELETE ") + (when del "Delete ") (package-menu--list-to-prompt del) + (when (and del ins) + (if upg "; " "; and ")) + (when ins "Install ") + (package-menu--list-to-prompt ins) + (when (and upg (or ins del)) "; and ") + (when upg "Upgrade ") + (package-menu--list-to-prompt upg) "? ")))) (defun package-menu--perform-transaction (install-list delete-list &optional async) |