From afc1f329356da167902d86b610023a32943f6cee Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 29 May 2023 16:44:48 +0300 Subject: [PATCH] Allow to disable the DWIMish behavior of 'x' in package menu * lisp/emacs-lisp/package.el (package-menu-use-current-if-no-marks): New defcustom. (package-menu-execute): Use it. (Bug#62563) * etc/NEWS: Announce the new option. --- etc/NEWS | 4 +++- lisp/emacs-lisp/package.el | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 7785d734a6f..60aa64b5ede 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1886,7 +1886,9 @@ These commands can be useful if the ".elc" files are out of date +++ *** New DWIM action on 'x' in "*Packages*" buffer. If no packages are marked, 'x' will install the package under point if -it isn't already, and remove it if it is installed. +it isn't already, and remove it if it is installed. Customize the new +option 'package-menu-use-current-if-no-marks' to the nil value to get +back the old behavior of signaling an error in that case. +++ *** New command 'package-vc-install'. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 340ca9400fa..202aca36f24 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -3313,6 +3313,18 @@ Values can be interactively added to this list by typing :version "25.1" :type '(repeat (regexp :tag "Hide packages with name matching"))) +(defcustom package-menu-use-current-if-no-marks t + "Whether \\\\[package-menu-execute] in package menu operates on current package if none are marked. + +If non-nil, and no packages are marked for installation or +deletion, \\\\[package-menu-execute] will operate on the current package at point, +see `package-menu-execute' for details. +The default is t. Set to nil to get back the original behavior +of having `package-menu-execute' signal an error when no packages +are marked for installation or deletion." + :version "29.1" + :type 'boolean) + (defun package-menu--refresh (&optional packages keywords) "Re-populate the `tabulated-list-entries'. PACKAGES should be nil or t, which means to display all known packages. @@ -3943,7 +3955,8 @@ invocations." ;; Nothing marked. (unless (or delete-list install-list) ;; Not on a package line. - (unless (tabulated-list-get-id) + (unless (and (tabulated-list-get-id) + package-menu-use-current-if-no-marks) (user-error "No operations specified")) (let* ((id (tabulated-list-get-id)) (status (package-menu-get-status))) -- 2.39.2