From 60d5a015d1fb6f10439c80d3b0733de88c204d6c Mon Sep 17 00:00:00 2001 From: Jonas Bernoulli Date: Thu, 11 May 2023 17:47:30 +0200 Subject: [PATCH] Update to Transient v0.4.0 Or strictly speaking v0.4.0-1-g428576a4.) --- doc/misc/transient.texi | 4 ++-- lisp/transient.el | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/doc/misc/transient.texi b/doc/misc/transient.texi index 33d689cc01b..330fdd1e3a2 100644 --- a/doc/misc/transient.texi +++ b/doc/misc/transient.texi @@ -31,7 +31,7 @@ General Public License for more details. @finalout @titlepage @title Transient User and Developer Manual -@subtitle for version 0.3.7.50 +@subtitle for version 0.4.0 @author Jonas Bernoulli @page @vskip 0pt plus 1filll @@ -74,7 +74,7 @@ that hurdle is Psionic K's interactive tutorial, available at @end quotation @noindent -This manual is for Transient version 0.3.7.50. +This manual is for Transient version 0.4.0. @insertcopying @end ifnottex diff --git a/lisp/transient.el b/lisp/transient.el index 9785e218b19..1d763c4ddeb 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -6,7 +6,7 @@ ;; URL: https://github.com/magit/transient ;; Keywords: extensions -;; Package-Version: 0.3.7.50 +;; Package-Version: 0.4.0 ;; Package-Requires: ((emacs "26.1")) ;; SPDX-License-Identifier: GPL-3.0-or-later @@ -3934,8 +3934,13 @@ search instead." (defun transient-isearch-abort () "Like `isearch-abort' but adapted for `transient'." (interactive) - (condition-case nil (isearch-abort) (quit)) - (transient--isearch-exit)) + (let ((around (lambda (fn) + (condition-case nil (funcall fn) (quit)) + (transient--isearch-exit)))) + (advice-add 'isearch-cancel :around around) + (unwind-protect + (isearch-abort) + (advice-remove 'isearch-cancel around)))) (defun transient--isearch-setup () (select-window transient--window) -- 2.39.2