aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2013-05-01 11:10:12 +0300
committerJuri Linkov2013-05-01 11:10:12 +0300
commitac63ec89d88c03cc139a2c6ab52c39b960b4ffb3 (patch)
tree46405553ec9d5fb21ecbca0bec5f397402a1d29e
parent9e9be37c1870d81de1c375a6231ea1deec2834b1 (diff)
downloademacs-ac63ec89d88c03cc139a2c6ab52c39b960b4ffb3.tar.gz
emacs-ac63ec89d88c03cc139a2c6ab52c39b960b4ffb3.zip
* lisp/isearch.el (isearch-forward, isearch-mode): Doc fix.
Fixes: debbugs:13923
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/isearch.el23
2 files changed, 24 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf2ac52dcbb..2e02f567058 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12013-05-01 Juri Linkov <juri@jurta.org> 12013-05-01 Juri Linkov <juri@jurta.org>
2 2
3 * isearch.el (isearch-forward, isearch-mode): Doc fix. (Bug#13923)
4
52013-05-01 Juri Linkov <juri@jurta.org>
6
3 * comint.el (comint-previous-matching-input): Don't print message 7 * comint.el (comint-previous-matching-input): Don't print message
4 "History item: %d" when `isearch-mode' is active. 8 "History item: %d" when `isearch-mode' is active.
5 (comint-history-isearch-message): Print message "History item: %d" 9 (comint-history-isearch-message): Print message "History item: %d"
diff --git a/lisp/isearch.el b/lisp/isearch.el
index b38bfc885f7..72a125fcecb 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -735,8 +735,9 @@ Other control and meta characters terminate the search
735 and are then executed normally (depending on `search-exit-option'). 735 and are then executed normally (depending on `search-exit-option').
736Likewise for function keys and mouse button events. 736Likewise for function keys and mouse button events.
737 737
738If this function is called non-interactively, it does not return to 738If this function is called non-interactively with a nil NO-RECURSIVE-EDIT,
739the calling function until the search is done." 739it does not return to the calling function until the search is done.
740See the function `isearch-mode' for more information."
740 741
741 (interactive "P\np") 742 (interactive "P\np")
742 (isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit))) 743 (isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit)))
@@ -799,7 +800,23 @@ as a regexp. See the command `isearch-forward' for more information."
799 800
800(defun isearch-mode (forward &optional regexp op-fun recursive-edit word) 801(defun isearch-mode (forward &optional regexp op-fun recursive-edit word)
801 "Start Isearch minor mode. 802 "Start Isearch minor mode.
802It is called by the function `isearch-forward' and other related functions." 803It is called by the function `isearch-forward' and other related functions.
804
805The non-nil arg FORWARD means searching in the forward direction.
806
807The non-nil arg REGEXP does an incremental regular expression search.
808
809The arg OP-FUN is a function to be called after each input character
810is processed. (It is not called after characters that exit the search.)
811
812When the arg RECURSIVE-EDIT is non-nil, this function behaves modally and
813does not return to the calling function until the search is completed.
814To behave this way it enters a recursive-edit and exits it when done
815isearching.
816
817The arg WORD, if t, does incremental search for a sequence of words,
818ignoring punctuation. If the value is a function, it is called to
819convert the search string to a regexp used by regexp search functions."
803 820
804 ;; Initialize global vars. 821 ;; Initialize global vars.
805 (setq isearch-forward forward 822 (setq isearch-forward forward