summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-08-13 13:51:08 +0000
committerMiles Bader <miles@gnu.org>2007-08-13 13:51:08 +0000
commite8ffd486dbb18f8e1e091bcd6b86bf3964cc4cba (patch)
treec65d3c3f6f61b82b8f9917c057b2af8236aae6f2 /lisp/isearch.el
parent9bba0f5a0113698fe737e567f527ac723125f728 (diff)
parent1b533623e21dd20ec8fb05285cdc47398a5619a1 (diff)
downloademacs-e8ffd486dbb18f8e1e091bcd6b86bf3964cc4cba.tar.gz
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 846-851) - Update from CVS - Merge from emacs--rel--22 * emacs--rel--22 (patch 88-92) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 242-244) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 93d43fcf18b..e0cba48eed9 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -825,7 +825,7 @@ NOPUSH is t and EDIT is t."
(run-hooks 'isearch-mode-end-hook))
;; If there was movement, mark the starting position.
- ;; Maybe should test difference between and set mark iff > threshold.
+ ;; Maybe should test difference between and set mark only if > threshold.
(if (/= (point) isearch-opoint)
(or (and transient-mark-mode mark-active)
(progn
@@ -2329,7 +2329,7 @@ since they have special meaning in a regexp."
;; - the direction of the current search is expected to be given by
;; `isearch-forward';
;; - the variable `isearch-error' is expected to be true
-;; iff `isearch-string' is an invalid regexp.
+;; only if `isearch-string' is an invalid regexp.
(defvar isearch-lazy-highlight-overlays nil)
(defvar isearch-lazy-highlight-wrapped nil)