From e99d8cb25db2d1306be011ecccd85845e41ccec8 Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Sun, 12 Apr 2015 15:11:08 +0100 Subject: [PATCH] * 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 file 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) -- 2.11.4.GIT