procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Artur Malabarba 2016-02-06 22:46:16 +00:00
parent 16140f7ece
commit 9ffe7ddd5e
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/isearch.el
View file

@ -1528,15 +1528,13 @@ The command then executes BODY and updates the isearch prompt."
(if docstring (concat "\n" docstring) "")) (if docstring (concat "\n" docstring) ""))
(interactive) (interactive)
,@(when function ,@(when function
`((setq isearch-regexp-function `((setq isearch-regexp-function #',function)
(unless (eq isearch-regexp-function #',function) (setq isearch-regexp nil)))
#',function))
(when isearch-regexp-function (setq isearch-regexp nil))))
,@body ,@body
(setq isearch-success t isearch-adjusted t) (setq isearch-success t isearch-adjusted t)
(isearch-update)) (isearch-update))
(define-key isearch-mode-map ,key #',command-name) (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 'isearch-message-prefix ,(format "%s " mode))
(put ',function :advertised-binding ,key) (put ',function :advertised-binding ,key)
(cl-callf (lambda (types) (cons 'choice (cl-callf (lambda (types) (cons 'choice