[Emacs-diffs] master e99d8cb 4/5: * lisp/emacs-lisp/package.el: Improve transaction y-or-n prompt

[Artur Malabarba]

branch: master
commit e99d8cb25db2d1306be011ecccd85845e41ccec8
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    * 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.
---
 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 92d71ba..6fb5ba4 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)