From e3b7fdb7503b77f77d0784e8155dee637dd53e9f Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 21 Jan 2024 21:28:05 -0500 Subject: Update completing-read require-match arg for Emacs 29 compatibility Several spots pass `require' to the REQUIRE-MATCH arg of magit-completing-read (and thus completing-read). That used to trigger the "anything else behaves like t behavior", as intended, but Emacs 29 (49e06183f59) gained special handling for function values. Rename the argument to non-nil/non-t symbol that doesn't collide with a known function name. --- lisp/km-magit.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lisp') diff --git a/lisp/km-magit.el b/lisp/km-magit.el index 1f9caa9..fa4a208 100644 --- a/lisp/km-magit.el +++ b/lisp/km-magit.el @@ -257,7 +257,7 @@ argument SUFFIX, prompt for a suffix to use instead of (list (magit-completing-read "Branch to archive" (magit-list-refnames "refs/heads") - nil 'require nil nil + nil 'require-match nil nil (or (magit-branch-at-point) (magit-get-previous-branch))))))) (setq branches (mapcar (lambda (branch) @@ -322,7 +322,7 @@ argument SUFFIX, prompt for a suffix to use instead of (interactive (list (magit-completing-read "Delete set with member" (magit-list-refnames "refs/heads") - nil 'require nil nil + nil 'require-match nil nil (or (magit-branch-at-point) (magit-get-previous-branch))))) (km/magit-branch--set-action "Delete" @@ -334,7 +334,7 @@ argument SUFFIX, prompt for a suffix to use instead of (interactive (list (magit-completing-read "Archive set with member" (magit-list-refnames "refs/heads") - nil 'require nil nil + nil 'require-match nil nil (or (magit-branch-at-point) (magit-get-previous-branch))))) (km/magit-branch--set-action "Archive" -- cgit v1.2.3