mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall.

Browse Source
This commit is contained in:
Alan Mackenzie 2015-11-18 21:14:30 +00:00
parent 2c56fc2a3f
commit b442b94858
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/isearch.el
View File

@ -171,11 +171,6 @@ is non-nil if the user quits the search.")
"Function to call to display the search prompt. "Function to call to display the search prompt.
If nil, use function `isearch-message'.") If nil, use function `isearch-message'.")
(defmacro isearch-call-message (&optional cqh ellip)
`(if isearch-message-function
(funcall isearch-message-function ,cqh ,ellip)
(isearch-message ,cqh ,ellip)))
(defvar isearch-wrap-function nil (defvar isearch-wrap-function nil
"Function to call to wrap the search when search is failed. "Function to call to wrap the search when search is failed.
If nil, move point to the beginning of the buffer for a forward search, If nil, move point to the beginning of the buffer for a forward search,
@ -974,7 +969,7 @@ The last thing it does is to run `isearch-update-post-hook'."
(null executing-kbd-macro)) (null executing-kbd-macro))
(progn (progn
(if (not (input-pending-p)) (if (not (input-pending-p))
(isearch-call-message)) (funcall (or isearch-message-function #'isearch-message)))
(if (and isearch-slow-terminal-mode (if (and isearch-slow-terminal-mode
(not (or isearch-small-window (not (or isearch-small-window
(pos-visible-in-window-p nil nil nil t)))) (pos-visible-in-window-p nil nil nil t))))
@ -1300,7 +1295,7 @@ You can update the global isearch variables by setting new values to
isearch-case-fold-search isearch-new-case-fold) isearch-case-fold-search isearch-new-case-fold)
;; Restore the minibuffer message before moving point. ;; Restore the minibuffer message before moving point.
(isearch-call-message nil t) (funcall (or isearch-message-function #'isearch-message) nil t)
;; Set point at the start (end) of old match if forward (backward), ;; Set point at the start (end) of old match if forward (backward),
;; so after exiting minibuffer isearch resumes at the start (end) ;; so after exiting minibuffer isearch resumes at the start (end)
@ -1901,7 +1896,8 @@ If search string is empty, just beep."
(length isearch-string)))) (length isearch-string))))
isearch-message (mapconcat 'isearch-text-char-description isearch-message (mapconcat 'isearch-text-char-description
isearch-string ""))) isearch-string "")))
(isearch-call-message nil t) ; Do this before moving point. ;; Do the following before moving point.
(funcall (or isearch-message-function #'isearch-message) nil t)
;; Use the isearch-other-end as new starting point to be able ;; Use the isearch-other-end as new starting point to be able
;; to find the remaining part of the search string again. ;; to find the remaining part of the search string again.
;; This is like what `isearch-search-and-update' does, ;; This is like what `isearch-search-and-update' does,
@ -2078,7 +2074,8 @@ With argument, add COUNT copies of the character."
(setq isearch-case-fold-search (setq isearch-case-fold-search
(isearch-no-upper-case-p isearch-string isearch-regexp)))) (isearch-no-upper-case-p isearch-string isearch-regexp))))
;; Not regexp, not reverse, or no match at point. ;; Not regexp, not reverse, or no match at point.
(isearch-call-message nil t) ; Do this before moving point. ;; Do the following before moving point.
(funcall (or isearch-message-function #'isearch-message) nil t)
(if (and isearch-other-end (not isearch-adjusted)) (if (and isearch-other-end (not isearch-adjusted))
(goto-char (if isearch-forward isearch-other-end (goto-char (if isearch-forward isearch-other-end
(min isearch-opoint (min isearch-opoint
@ -2432,7 +2429,7 @@ Search is updated accordingly."
(isearch-ring-adjust1 advance) (isearch-ring-adjust1 advance)
(if search-ring-update (if search-ring-update
(progn (progn
(isearch-call-message nil t) (funcall (or isearch-message-function #'isearch-message) nil t)
(isearch-search) (isearch-search)
(isearch-push-state) (isearch-push-state)
(isearch-update)) (isearch-update))