Commit 9ffe7ddd authored by Artur Malabarba's avatar Artur Malabarba

* lisp/isearch.el (isearch-define-mode-toggle): Improve logic

parent 16140f7e
......@@ -1528,15 +1528,13 @@ The command then executes BODY and updates the isearch prompt."
(if docstring (concat "\n" docstring) ""))
(interactive)
,@(when function
`((setq isearch-regexp-function
(unless (eq isearch-regexp-function #',function)
#',function))
(when isearch-regexp-function (setq isearch-regexp nil))))
`((setq isearch-regexp-function #',function)
(setq isearch-regexp nil)))
,@body
(setq isearch-success t isearch-adjusted t)
(isearch-update))
(define-key isearch-mode-map ,key #',command-name)
,@(when (symbolp function)
,@(when (and function (symbolp function))
`((put ',function 'isearch-message-prefix ,(format "%s " mode))
(put ',function :advertised-binding ,key)
(cl-callf (lambda (types) (cons 'choice
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment