aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Malabarba2015-04-12 15:11:08 +0100
committerArtur Malabarba2015-04-12 16:16:06 +0100
commite99d8cb25db2d1306be011ecccd85845e41ccec8 (patch)
treef8849be381273a14d6704e899cb81b420da83426
parent5aa0dfe4b73c0ef1a8462410265a29c55e244879 (diff)
downloademacs-e99d8cb25db2d1306be011ecccd85845e41ccec8.tar.gz
emacs-e99d8cb25db2d1306be011ecccd85845e41ccec8.zip
* 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.
-rw-r--r--lisp/emacs-lisp/package.el16
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."
2780 (del (cl-set-difference delete upg :key #'package-desc-name))) 2780 (del (cl-set-difference delete upg :key #'package-desc-name)))
2781 (y-or-n-p 2781 (y-or-n-p
2782 (concat 2782 (concat
2783 (when upg "UPGRADE ") 2783 (when del "Delete ")
2784 (package-menu--list-to-prompt upg)
2785 (when (and upg ins)
2786 (if del "; " "; and "))
2787 (when ins "INSTALL ")
2788 (package-menu--list-to-prompt ins)
2789 (when (and del (or ins upg)) "; and ")
2790 (when del "DELETE ")
2791 (package-menu--list-to-prompt del) 2784 (package-menu--list-to-prompt del)
2785 (when (and del ins)
2786 (if upg "; " "; and "))
2787 (when ins "Install ")
2788 (package-menu--list-to-prompt ins)
2789 (when (and upg (or ins del)) "; and ")
2790 (when upg "Upgrade ")
2791 (package-menu--list-to-prompt upg)
2792 "? ")))) 2792 "? "))))
2793 2793
2794(defun package-menu--perform-transaction (install-list delete-list &optional async) 2794(defun package-menu--perform-transaction (install-list delete-list &optional async)