Commit 29e53a0a authored by Karl Fogel's avatar Karl Fogel

(isearch-yank-internal): New helper function.

(isearch-yank-char): New function.
(isearch-yank-word, isearch-yank-line): Rewrite to use
isearch-yank-internal.
parent 59a86c99
2001-11-28 Karl Fogel <kfogel@red-bean.com>
* isearch.el (isearch-yank-internal): New helper function.
(isearch-yank-char): New function.
(isearch-yank-word, isearch-yank-line): Rewrite to use
isearch-yank-internal.
2001-11-28 Eli Zaretskii <eliz@is.elta.co.il>
* mouse.el (mouse-set-font): Make it a no-op if multiple fonts
......
......@@ -1073,24 +1073,32 @@ Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
(funcall binding click))))))
(defun isearch-yank-word ()
"Pull next word from buffer into search string."
(interactive)
(defun isearch-yank-internal (jumpform)
"Pull the text from point to the point reached by JUMPFORM.
JUMPFORM is a lambda expression that takes no arguments and returns a
buffer position, possibly having moved point to that position. For
example, it might move point forward by a word and return point, or it
might return the position of the end of the line."
(isearch-yank-string
(save-excursion
(and (not isearch-forward) isearch-other-end
(goto-char isearch-other-end))
(buffer-substring-no-properties
(point) (progn (forward-word 1) (point))))))
(buffer-substring-no-properties (point) (funcall jumpform)))))
(defun isearch-yank-char ()
"Pull next letter from buffer into search string."
(interactive)
(isearch-yank-internal (lambda () (forward-char 1) (point))))
(defun isearch-yank-word ()
"Pull next word from buffer into search string."
(interactive)
(isearch-yank-internal (lambda () (forward-word 1) (point))))
(defun isearch-yank-line ()
"Pull rest of line from buffer into search string."
(interactive)
(isearch-yank-string
(save-excursion
(and (not isearch-forward) isearch-other-end
(goto-char isearch-other-end))
(buffer-substring-no-properties (point) (line-end-position)))))
(isearch-yank-internal (lambda () (line-end-position))))
(defun isearch-search-and-update ()
......
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