From: Artur Malabarba <bruce.connor.am@gmail.com>
Date: Sun, 12 Apr 2015 14:11:08 +0000 (+0100)
Subject: * lisp/emacs-lisp/package.el: Improve transaction y-or-n prompt
X-Git-Tag: emacs-25.0.90~2460
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e99d8cb25db2d1306be011ecccd85845e41ccec8;p=emacs.git

* 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.
---

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)