aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2003-01-24 17:12:00 +0000
committerJuanma Barranquero2003-01-24 17:12:00 +0000
commitb48ca14f34ae3f28ff9f1cfec36e37aca70432bd (patch)
treecd208e09f93658ecf109c96ac45c5d38b7c0dec2
parent81e302ef311deba309ec7aec0f16bb3e6504df24 (diff)
downloademacs-b48ca14f34ae3f28ff9f1cfec36e37aca70432bd.tar.gz
emacs-b48ca14f34ae3f28ff9f1cfec36e37aca70432bd.zip
(isearch-forward): Fix typo.
-rw-r--r--lisp/isearch.el60
1 files changed, 30 insertions, 30 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 5b9fe461068..af4099d29d8 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -75,7 +75,7 @@
75;; Added word search option to isearch-edit-string. 75;; Added word search option to isearch-edit-string.
76;; Renamed isearch-quit to isearch-abort. 76;; Renamed isearch-quit to isearch-abort.
77;; Numerous changes to comments and doc strings. 77;; Numerous changes to comments and doc strings.
78;; 78;;
79;; Revision 1.3 92/06/29 13:10:08 liberte 79;; Revision 1.3 92/06/29 13:10:08 liberte
80;; Moved modal isearch-mode handling into isearch-mode. 80;; Moved modal isearch-mode handling into isearch-mode.
81;; Got rid of buffer-local isearch variables. 81;; Got rid of buffer-local isearch variables.
@@ -184,8 +184,8 @@ whenever point is in one of them."
184This variable makes a difference when `search-invisible' is set to `open'. 184This variable makes a difference when `search-invisible' is set to `open'.
185It means that after search makes some invisible text visible 185It means that after search makes some invisible text visible
186to show the match, it makes the text invisible again when the match moves. 186to show the match, it makes the text invisible again when the match moves.
187Ordinarily the text becomes invisible again at the end of the search." 187Ordinarily the text becomes invisible again at the end of the search."
188 :type 'boolean 188 :type 'boolean
189 :group 'isearch) 189 :group 'isearch)
190 190
191(defcustom isearch-resume-enabled t 191(defcustom isearch-resume-enabled t
@@ -245,7 +245,7 @@ Default value, nil, means edit the string instead."
245 ;; Make function keys, etc, exit the search. 245 ;; Make function keys, etc, exit the search.
246 (define-key map [t] 'isearch-other-control-char) 246 (define-key map [t] 'isearch-other-control-char)
247 ;; Control chars, by default, end isearch mode transparently. 247 ;; Control chars, by default, end isearch mode transparently.
248 ;; We need these explicit definitions because, in a dense keymap, 248 ;; We need these explicit definitions because, in a dense keymap,
249 ;; the binding for t does not affect characters. 249 ;; the binding for t does not affect characters.
250 ;; We use a dense keymap to save space. 250 ;; We use a dense keymap to save space.
251 (while (< i ?\ ) 251 (while (< i ?\ )
@@ -284,7 +284,7 @@ Default value, nil, means edit the string instead."
284 (error "Inconsistency in isearch.el")) 284 (error "Inconsistency in isearch.el"))
285 (define-key map "\e\e\e" 'isearch-cancel) 285 (define-key map "\e\e\e" 'isearch-cancel)
286 (define-key map [escape escape escape] 'isearch-cancel) 286 (define-key map [escape escape escape] 'isearch-cancel)
287 287
288 (define-key map "\C-q" 'isearch-quote-char) 288 (define-key map "\C-q" 'isearch-quote-char)
289 289
290 (define-key map "\r" 'isearch-exit) 290 (define-key map "\r" 'isearch-exit)
@@ -292,7 +292,7 @@ Default value, nil, means edit the string instead."
292 (define-key map "\t" 'isearch-printing-char) 292 (define-key map "\t" 'isearch-printing-char)
293 (define-key map " " 'isearch-whitespace-chars) 293 (define-key map " " 'isearch-whitespace-chars)
294 (define-key map [?\S-\ ] 'isearch-whitespace-chars) 294 (define-key map [?\S-\ ] 'isearch-whitespace-chars)
295 295
296 (define-key map "\C-w" 'isearch-yank-word-or-char) 296 (define-key map "\C-w" 'isearch-yank-word-or-char)
297 (define-key map "\C-y" 'isearch-yank-line) 297 (define-key map "\C-y" 'isearch-yank-line)
298 298
@@ -444,7 +444,7 @@ Do incremental search forward.
444With a prefix argument, do an incremental regular expression search instead. 444With a prefix argument, do an incremental regular expression search instead.
445\\<isearch-mode-map> 445\\<isearch-mode-map>
446As you type characters, they add to the search string and are found. 446As you type characters, they add to the search string and are found.
447The following non-printing keys are bound in `isearch-mode-map'. 447The following non-printing keys are bound in `isearch-mode-map'.
448 448
449Type \\[isearch-delete-char] to cancel characters from end of search string. 449Type \\[isearch-delete-char] to cancel characters from end of search string.
450Type \\[isearch-exit] to exit, leaving point at location found. 450Type \\[isearch-exit] to exit, leaving point at location found.
@@ -475,7 +475,7 @@ Type \\[isearch-ring-retreat] to search for the previous item in the search\
475Type \\[isearch-complete] to complete the search string using the search ring. 475Type \\[isearch-complete] to complete the search string using the search ring.
476 476
477If an input method is turned on in the current buffer, that input 477If an input method is turned on in the current buffer, that input
478method is also active while you are typing a characters to search. To 478method is also active while you are typing characters to search. To
479toggle the input method, type \\[isearch-toggle-input-method]. It 479toggle the input method, type \\[isearch-toggle-input-method]. It
480also toggles the input method in the current buffer. 480also toggles the input method in the current buffer.
481 481
@@ -483,7 +483,7 @@ To use a different input method for searching, type
483\\[isearch-toggle-specified-input-method], and specify an input method 483\\[isearch-toggle-specified-input-method], and specify an input method
484you want to use. 484you want to use.
485 485
486The above keys, bound in `isearch-mode-map', are often controlled by 486The above keys, bound in `isearch-mode-map', are often controlled by
487 options; do M-x apropos on search-.* to find them. 487 options; do M-x apropos on search-.* to find them.
488Other control and meta characters terminate the search 488Other control and meta characters terminate the search
489 and are then executed normally (depending on `search-exit-option'). 489 and are then executed normally (depending on `search-exit-option').
@@ -535,7 +535,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
535;;(defvar isearch-commands '(isearch-forward isearch-backward 535;;(defvar isearch-commands '(isearch-forward isearch-backward
536;; isearch-forward-regexp isearch-backward-regexp) 536;; isearch-forward-regexp isearch-backward-regexp)
537;; "List of commands for which isearch-mode does not recursive-edit.") 537;; "List of commands for which isearch-mode does not recursive-edit.")
538 538
539 539
540(defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p) 540(defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p)
541 "Start isearch minor mode. Called by `isearch-forward', etc. 541 "Start isearch minor mode. Called by `isearch-forward', etc.
@@ -611,8 +611,8 @@ is treated as a regexp. See \\[isearch-forward] for more info."
611 (add-hook 'mouse-leave-buffer-hook 'isearch-done) 611 (add-hook 'mouse-leave-buffer-hook 'isearch-done)
612 (add-hook 'kbd-macro-termination-hook 'isearch-done) 612 (add-hook 'kbd-macro-termination-hook 'isearch-done)
613 613
614 ;; isearch-mode can be made modal (in the sense of not returning to 614 ;; isearch-mode can be made modal (in the sense of not returning to
615 ;; the calling function until searching is completed) by entering 615 ;; the calling function until searching is completed) by entering
616 ;; a recursive-edit and exiting it when done isearching. 616 ;; a recursive-edit and exiting it when done isearching.
617 (if recursive-edit 617 (if recursive-edit
618 (let ((isearch-recursive-edit t)) 618 (let ((isearch-recursive-edit t))
@@ -630,7 +630,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
630 (if (not (input-pending-p)) 630 (if (not (input-pending-p))
631 (isearch-message)) 631 (isearch-message))
632 (if (and isearch-slow-terminal-mode 632 (if (and isearch-slow-terminal-mode
633 (not (or isearch-small-window 633 (not (or isearch-small-window
634 (pos-visible-in-window-p)))) 634 (pos-visible-in-window-p))))
635 (let ((found-point (point))) 635 (let ((found-point (point)))
636 (setq isearch-small-window t) 636 (setq isearch-small-window t)
@@ -734,7 +734,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
734(defun isearch-update-ring (string &optional regexp) 734(defun isearch-update-ring (string &optional regexp)
735 "Add STRING to the beginning of the search ring. 735 "Add STRING to the beginning of the search ring.
736REGEXP says which ring to use." 736REGEXP says which ring to use."
737 (if regexp 737 (if regexp
738 (if (or (null regexp-search-ring) 738 (if (or (null regexp-search-ring)
739 (not (string= string (car regexp-search-ring)))) 739 (not (string= string (car regexp-search-ring))))
740 (progn 740 (progn
@@ -768,7 +768,7 @@ However, if this is the first command after starting incremental
768search and `search-nonincremental-instead' is non-nil, do a 768search and `search-nonincremental-instead' is non-nil, do a
769nonincremental search instead via `isearch-edit-string'." 769nonincremental search instead via `isearch-edit-string'."
770 (interactive) 770 (interactive)
771 (if (and search-nonincremental-instead 771 (if (and search-nonincremental-instead
772 (= 0 (length isearch-string))) 772 (= 0 (length isearch-string)))
773 (let ((isearch-nonincremental t)) 773 (let ((isearch-nonincremental t))
774 (isearch-edit-string))) 774 (isearch-edit-string)))
@@ -840,7 +840,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
840 ) 840 )
841 841
842 ;; Actually terminate isearching until editing is done. 842 ;; Actually terminate isearching until editing is done.
843 ;; This is so that the user can do anything without failure, 843 ;; This is so that the user can do anything without failure,
844 ;; like switch buffers and start another isearch, and return. 844 ;; like switch buffers and start another isearch, and return.
845 (condition-case err 845 (condition-case err
846 (isearch-done t t) 846 (isearch-done t t)
@@ -848,7 +848,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
848 848
849 (isearch-message) ;; for read-char 849 (isearch-message) ;; for read-char
850 (unwind-protect 850 (unwind-protect
851 (let* (;; Why does following read-char echo? 851 (let* (;; Why does following read-char echo?
852 ;;(echo-keystrokes 0) ;; not needed with above message 852 ;;(echo-keystrokes 0) ;; not needed with above message
853 (e (let ((cursor-in-echo-area t)) 853 (e (let ((cursor-in-echo-area t))
854 (read-event))) 854 (read-event)))
@@ -882,9 +882,9 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
882 (mapconcat 'isearch-text-char-description 882 (mapconcat 'isearch-text-char-description
883 isearch-new-string ""))) 883 isearch-new-string "")))
884 ;; Always resume isearching by restarting it. 884 ;; Always resume isearching by restarting it.
885 (isearch-mode isearch-forward 885 (isearch-mode isearch-forward
886 isearch-regexp 886 isearch-regexp
887 isearch-op-fun 887 isearch-op-fun
888 nil 888 nil
889 isearch-word) 889 isearch-word)
890 890
@@ -915,7 +915,7 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
915 ;; Reinvoke the pending search. 915 ;; Reinvoke the pending search.
916 (isearch-search) 916 (isearch-search)
917 (isearch-update) 917 (isearch-update)
918 (if isearch-nonincremental 918 (if isearch-nonincremental
919 (progn 919 (progn
920 ;; (sit-for 1) ;; needed if isearch-done does: (message "") 920 ;; (sit-for 1) ;; needed if isearch-done does: (message "")
921 (isearch-done)))) 921 (isearch-done))))
@@ -1121,7 +1121,7 @@ might return the position of the end of the line."
1121 "Pull next character or word from buffer into search string." 1121 "Pull next character or word from buffer into search string."
1122 (interactive) 1122 (interactive)
1123 (isearch-yank-internal 1123 (isearch-yank-internal
1124 (lambda () 1124 (lambda ()
1125 (if (or (= (char-syntax (or (char-after) 0)) ?w) 1125 (if (or (= (char-syntax (or (char-after) 0)) ?w)
1126 (= (char-syntax (or (char-after (1+ (point))) 0)) ?w)) 1126 (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
1127 (forward-word 1) 1127 (forward-word 1)
@@ -1214,7 +1214,7 @@ might return the position of the end of the line."
1214 (max cs isearch-barrier) 1214 (max cs isearch-barrier)
1215 (min cs isearch-barrier))))))) 1215 (min cs isearch-barrier)))))))
1216 (isearch-process-search-char last-command-char)) 1216 (isearch-process-search-char last-command-char))
1217 1217
1218 1218
1219(defun isearch-|-char () 1219(defun isearch-|-char ()
1220 "If in regexp search, jump to the barrier." 1220 "If in regexp search, jump to the barrier."
@@ -1315,7 +1315,7 @@ and the meta character is unread so that it applies to editing the string."
1315 ;; obviously wrong for the case that a down-mouse event 1315 ;; obviously wrong for the case that a down-mouse event
1316 ;; on another window invokes this function. The event 1316 ;; on another window invokes this function. The event
1317 ;; will contain the window clicked on and that window's 1317 ;; will contain the window clicked on and that window's
1318 ;; buffer is certainaly not always in Isearch mode. 1318 ;; buffer is certainly not always in Isearch mode.
1319 ;; 1319 ;;
1320 ;; Leave the code in, but check for current buffer not 1320 ;; Leave the code in, but check for current buffer not
1321 ;; being in Isearch mode for now, until someone tells 1321 ;; being in Isearch mode for now, until someone tells
@@ -1377,7 +1377,7 @@ Obsolete."
1377 "Match all whitespace chars, if in regexp mode. 1377 "Match all whitespace chars, if in regexp mode.
1378If you want to search for just a space, type \\<isearch-mode-map>\\[isearch-quote-char] SPC." 1378If you want to search for just a space, type \\<isearch-mode-map>\\[isearch-quote-char] SPC."
1379 (interactive) 1379 (interactive)
1380 (if isearch-regexp 1380 (if isearch-regexp
1381 (if (and search-whitespace-regexp (not isearch-within-brackets) 1381 (if (and search-whitespace-regexp (not isearch-within-brackets)
1382 (not isearch-invalid-regexp)) 1382 (not isearch-invalid-regexp))
1383 (isearch-process-search-string search-whitespace-regexp " ") 1383 (isearch-process-search-string search-whitespace-regexp " ")
@@ -1506,7 +1506,7 @@ With prefix arg N, insert the Nth element."
1506 (progn 1506 (progn
1507 (if completion-auto-help 1507 (if completion-auto-help
1508 (with-output-to-temp-buffer "*Isearch completions*" 1508 (with-output-to-temp-buffer "*Isearch completions*"
1509 (display-completion-list 1509 (display-completion-list
1510 (all-completions isearch-string alist)))) 1510 (all-completions isearch-string alist))))
1511 t) 1511 t)
1512 (and completion 1512 (and completion
@@ -1559,9 +1559,9 @@ If there is no completion possible, say so and continue searching."
1559 (isearch-top-state)) 1559 (isearch-top-state))
1560 1560
1561(defun isearch-push-state () 1561(defun isearch-push-state ()
1562 (setq isearch-cmds 1562 (setq isearch-cmds
1563 (cons (list isearch-string isearch-message (point) 1563 (cons (list isearch-string isearch-message (point)
1564 isearch-success isearch-forward isearch-other-end 1564 isearch-success isearch-forward isearch-other-end
1565 isearch-word 1565 isearch-word
1566 isearch-invalid-regexp isearch-wrapped isearch-barrier 1566 isearch-invalid-regexp isearch-wrapped isearch-barrier
1567 isearch-within-brackets isearch-case-fold-search) 1567 isearch-within-brackets isearch-case-fold-search)
@@ -1694,7 +1694,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
1694 1694
1695;; Called when opening an overlay, and we are still in isearch. 1695;; Called when opening an overlay, and we are still in isearch.
1696(defun isearch-open-overlay-temporary (ov) 1696(defun isearch-open-overlay-temporary (ov)
1697 (if (not (null (overlay-get ov 'isearch-open-invisible-temporary))) 1697 (if (not (null (overlay-get ov 'isearch-open-invisible-temporary)))
1698 ;; Some modes would want to open the overlays temporary during 1698 ;; Some modes would want to open the overlays temporary during
1699 ;; isearch in their own way, they should set the 1699 ;; isearch in their own way, they should set the
1700 ;; `isearch-open-invisible-temporary' to a function doing this. 1700 ;; `isearch-open-invisible-temporary' to a function doing this.
@@ -1865,7 +1865,7 @@ Can be changed via `isearch-search-fun-function' for special needs."
1865 "Return t if there are no upper case chars in STRING. 1865 "Return t if there are no upper case chars in STRING.
1866If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\') 1866If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\')
1867since they have special meaning in a regexp." 1867since they have special meaning in a regexp."
1868 (let (quote-flag (i 0) (len (length string)) found) 1868 (let (quote-flag (i 0) (len (length string)) found)
1869 (while (and (not found) (< i len)) 1869 (while (and (not found) (< i len))
1870 (let ((char (aref string i))) 1870 (let ((char (aref string i)))
1871 (if (and regexp-flag (eq char ?\\)) 1871 (if (and regexp-flag (eq char ?\\))