(isearch-forward): Fix typo.

2 files changed, 50 insertions, 46 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dbb82530d8b..e898e11e307 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2003-01-24  Juanma Barranquero  <lektu@terra.es>
+
+	* isearch.el (isearch-forward): Fix typo.
+
 2003-01-23  Masatake YAMATO  <jet@gyve.org>
 
 	* progmodes/asm-mode.el (asm-mode): Added syntax table entries for
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 29da10ade75..1fff37c25a9 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -75,7 +75,7 @@
 ;; Added word search option to isearch-edit-string.
 ;; Renamed isearch-quit to isearch-abort.
 ;; Numerous changes to comments and doc strings.
-;; 
+;;
 ;; Revision 1.3  92/06/29  13:10:08  liberte
 ;; Moved modal isearch-mode handling into isearch-mode.
 ;; Got rid of buffer-local isearch variables.
@@ -182,8 +182,8 @@ an overlay having an `invisible' property and that overlay has a property
 This variable makes a difference when `search-invisible' is set to `open'.
 It means that after search makes some invisible text visible
 to show the match, it makes the text invisible again when the match moves.
-Ordinarily the text becomes invisible again at the end of the search."  
-  :type 'boolean 
+Ordinarily the text becomes invisible again at the end of the search."
+  :type 'boolean
   :group 'isearch)
 
 (defvar isearch-mode-hook nil
@@ -238,7 +238,7 @@ Default value, nil, means edit the string instead."
     ;; Make function keys, etc, exit the search.
     (define-key map [t] 'isearch-other-control-char)
     ;; Control chars, by default, end isearch mode transparently.
-    ;; We need these explicit definitions because, in a dense keymap, 
+    ;; We need these explicit definitions because, in a dense keymap,
     ;; the binding for t does not affect characters.
     ;; We use a dense keymap to save space.
     (while (< i ?\ )
@@ -277,7 +277,7 @@ Default value, nil, means edit the string instead."
 	(error "Inconsistency in isearch.el"))
     (define-key map "\e\e\e" 'isearch-cancel)
     (define-key map  [escape escape escape] 'isearch-cancel)
-    
+
     (define-key map "\C-q" 'isearch-quote-char)
 
     (define-key map "\r" 'isearch-exit)
@@ -285,7 +285,7 @@ Default value, nil, means edit the string instead."
     (define-key map "\t" 'isearch-printing-char)
     (define-key map " " 'isearch-whitespace-chars)
     (define-key map [?\S-\ ] 'isearch-whitespace-chars)
-    
+
     (define-key map "\C-w" 'isearch-yank-word)
     (define-key map "\C-y" 'isearch-yank-line)
 
@@ -428,7 +428,7 @@ Do incremental search forward.
 With a prefix argument, do an incremental regular expression search instead.
 \\<isearch-mode-map>
 As you type characters, they add to the search string and are found.
-The following non-printing keys are bound in `isearch-mode-map'.  
+The following non-printing keys are bound in `isearch-mode-map'.
 
 Type \\[isearch-delete-char] to cancel characters from end of search string.
 Type \\[isearch-exit] to exit, leaving point at location found.
@@ -459,7 +459,7 @@ Type \\[isearch-ring-retreat] to search for the previous item in the search\
 Type \\[isearch-complete] to complete the search string using the search ring.
 
 If an input method is turned on in the current buffer, that input
-method is also active while you are typing a characters to search.  To
+method is also active while you are typing characters to search.  To
 toggle the input method, type \\[isearch-toggle-input-method].  It
 also toggles the input method in the current buffer.
 
@@ -467,7 +467,7 @@ To use a different input method for searching, type
 \\[isearch-toggle-specified-input-method], and specify an input method
 you want to use.
 
-The above keys, bound in `isearch-mode-map', are often controlled by 
+The above keys, bound in `isearch-mode-map', are often controlled by
  options; do M-x apropos on search-.* to find them.
 Other control and meta characters terminate the search
  and are then executed normally (depending on `search-exit-option').
@@ -519,7 +519,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 ;;(defvar isearch-commands '(isearch-forward isearch-backward
 ;;			     isearch-forward-regexp isearch-backward-regexp)
 ;;  "List of commands for which isearch-mode does not recursive-edit.")
-			     
+
 
 (defun isearch-mode (forward &optional regexp op-fun recursive-edit word-p)
   "Start isearch minor mode.  Called by `isearch-forward', etc.
@@ -592,8 +592,8 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
   (add-hook 'mouse-leave-buffer-hook 'isearch-done)
   (add-hook 'kbd-macro-termination-hook 'isearch-done)
 
-  ;; isearch-mode can be made modal (in the sense of not returning to 
-  ;; the calling function until searching is completed) by entering 
+  ;; isearch-mode can be made modal (in the sense of not returning to
+  ;; the calling function until searching is completed) by entering
   ;; a recursive-edit and exiting it when done isearching.
   (if recursive-edit
       (let ((isearch-recursive-edit t))
@@ -604,13 +604,13 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 ;; Some high level utilities.  Others below.
 
 (defun isearch-update ()
-  ;; Called after each command to update the display.  
+  ;; Called after each command to update the display.
   (if (null unread-command-events)
       (progn
         (if (not (input-pending-p))
             (isearch-message))
         (if (and isearch-slow-terminal-mode
-                 (not (or isearch-small-window 
+                 (not (or isearch-small-window
                           (pos-visible-in-window-p))))
             (let ((found-point (point)))
               (setq isearch-small-window t)
@@ -708,7 +708,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
 (defun isearch-update-ring (string &optional regexp)
   "Add STRING to the beginning of the search ring.
 REGEXP says which ring to use."
-  (if regexp 
+  (if regexp
       (if (or (null regexp-search-ring)
 	      (not (string= string (car regexp-search-ring))))
 	  (progn
@@ -730,7 +730,7 @@ REGEXP says which ring to use."
 ;;;   (interactive) ;; Is this necessary?
 ;;;   ;; First terminate isearch-mode.
 ;;;   (isearch-done)
-;;;   (isearch-clean-overlays) 
+;;;   (isearch-clean-overlays)
 ;;;   (handle-switch-frame (car (cdr last-command-char))))
 
 
@@ -742,7 +742,7 @@ However, if this is the first command after starting incremental
 search and `search-nonincremental-instead' is non-nil, do a
 nonincremental search instead via `isearch-edit-string'."
   (interactive)
-  (if (and search-nonincremental-instead 
+  (if (and search-nonincremental-instead
 	   (= 0 (length isearch-string)))
       (let ((isearch-nonincremental t))
 	(isearch-edit-string)))
@@ -814,7 +814,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead."
 	      )
 
 	  ;; Actually terminate isearching until editing is done.
-	  ;; This is so that the user can do anything without failure, 
+	  ;; This is so that the user can do anything without failure,
 	  ;; like switch buffers and start another isearch, and return.
 	  (condition-case err
 	      (isearch-done t t)
@@ -822,7 +822,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead."
 
 	  (isearch-message) ;; for read-char
 	  (unwind-protect
-	      (let* (;; Why does following read-char echo?  
+	      (let* (;; Why does following read-char echo?
 		     ;;(echo-keystrokes 0) ;; not needed with above message
 		     (e (let ((cursor-in-echo-area t))
 			  (read-event)))
@@ -855,9 +855,9 @@ If first char entered is \\[isearch-yank-word], then do word search instead."
 		      (mapconcat 'isearch-text-char-description
 				 isearch-new-string "")))
 	    ;; Always resume isearching by restarting it.
-	    (isearch-mode isearch-forward 
-			  isearch-regexp 
-			  isearch-op-fun 
+	    (isearch-mode isearch-forward
+			  isearch-regexp
+			  isearch-op-fun
 			  nil
 			  isearch-word)
 
@@ -884,7 +884,7 @@ If first char entered is \\[isearch-yank-word], then do word search instead."
 	;; Reinvoke the pending search.
 	(isearch-search)
 	(isearch-update)
-	(if isearch-nonincremental 
+	(if isearch-nonincremental
 	    (progn
 	      ;; (sit-for 1) ;; needed if isearch-done does: (message "")
 	      (isearch-done))))
@@ -1012,7 +1012,7 @@ Use `isearch-exit' to quit without signaling."
   (isearch-update))
 
 (defun isearch-delete-char ()
-  "Discard last input item and move point back.  
+  "Discard last input item and move point back.
 If no previous match was done, just beep."
   (interactive)
   (if (null (cdr isearch-cmds))
@@ -1111,10 +1111,10 @@ Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
 				 (regexp-quote isearch-string))))
 	       (error nil))
 	     (or isearch-yank-flag
-		 (<= (match-end 0) 
+		 (<= (match-end 0)
 		     (min isearch-opoint isearch-barrier))))
 	(progn
-	  (setq isearch-success t 
+	  (setq isearch-success t
 		isearch-invalid-regexp nil
 		isearch-within-brackets nil
 		isearch-other-end (match-end 0))
@@ -1124,8 +1124,8 @@ Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
       ;; Not regexp, not reverse, or no match at point.
       (if (and isearch-other-end (not isearch-adjusted))
 	  (goto-char (if isearch-forward isearch-other-end
-		       (min isearch-opoint 
-			    isearch-barrier 
+		       (min isearch-opoint
+			    isearch-barrier
 			    (1+ isearch-other-end)))))
       (isearch-search)
       ))
@@ -1143,7 +1143,7 @@ Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
 (defun isearch-*-char ()
   "Handle * and ? specially in regexps."
   (interactive)
-  (if isearch-regexp 
+  (if isearch-regexp
       (let ((idx (length isearch-string)))
 	(while (and (> idx 0)
 		    (eq (aref isearch-string (1- idx)) ?\\))
@@ -1162,7 +1162,7 @@ Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
 		 (max cs isearch-barrier)
 	       (min cs isearch-barrier)))))))
   (isearch-process-search-char last-command-char))
-  
+
 
 (defun isearch-|-char ()
   "If in regexp search, jump to the barrier."
@@ -1249,7 +1249,7 @@ and the meta character is unread so that it applies to editing the string."
 	     (when (and (> (length key) 1)
 			(symbolp (aref key 0))
 			(listp (aref key 1))
-			(not (numberp (posn-point 
+			(not (numberp (posn-point
 				       (event-start (aref key 1))))))
 	       (pop unread-command-events)
 	       (setq main-event (car unread-command-events)))
@@ -1263,7 +1263,7 @@ and the meta character is unread so that it applies to editing the string."
 	     ;; obviously wrong for the case that a down-mouse event
 	     ;; on another window invokes this function.  The event
 	     ;; will contain the window clicked on and that window's
-	     ;; buffer is certainaly not always in Isearch mode.
+	     ;; buffer is certainly not always in Isearch mode.
 	     ;;
 	     ;; Leave the code in, but check for current buffer not
 	     ;; being in Isearch mode for now, until someone tells
@@ -1325,7 +1325,7 @@ Obsolete."
   "Match all whitespace chars, if in regexp mode.
 If you want to search for just a space, type \\[quoted-insert] SPC."
   (interactive)
-  (if isearch-regexp 
+  (if isearch-regexp
       (if (and search-whitespace-regexp (not isearch-within-brackets)
 	       (not isearch-invalid-regexp))
 	  (isearch-process-search-string search-whitespace-regexp " ")
@@ -1339,8 +1339,8 @@ If you want to search for just a space, type \\[quoted-insert] SPC."
 
 (defun isearch-process-search-char (char)
   ;; Append the char to the search string, update the message and re-search.
-  (isearch-process-search-string 
-   (char-to-string char) 
+  (isearch-process-search-string
+   (char-to-string char)
    (if (>= char ?\200)
        (char-to-string char)
      (isearch-text-char-description char))))
@@ -1454,7 +1454,7 @@ With prefix arg N, insert the Nth element."
 	  (progn
 	    (if completion-auto-help
 		(with-output-to-temp-buffer "*Isearch completions*"
-		  (display-completion-list 
+		  (display-completion-list
 		   (all-completions isearch-string alist))))
 	    t)
 	(and completion
@@ -1507,9 +1507,9 @@ If there is no completion possible, say so and continue searching."
   (isearch-top-state))
 
 (defun isearch-push-state ()
-  (setq isearch-cmds 
+  (setq isearch-cmds
 	(cons (list isearch-string isearch-message (point)
-		    isearch-success isearch-forward isearch-other-end 
+		    isearch-success isearch-forward isearch-other-end
 		    isearch-word
 		    isearch-invalid-regexp isearch-wrapped isearch-barrier
 		    isearch-within-brackets isearch-case-fold-search)
@@ -1612,7 +1612,7 @@ If there is no completion possible, say so and continue searching."
     (quit (isearch-unread ?\C-g)
 	  (setq isearch-success nil))
 
-    (invalid-regexp 
+    (invalid-regexp
      (setq isearch-invalid-regexp (car (cdr lossage)))
      (setq isearch-within-brackets (string-match "\\`Unmatched \\["
 						 isearch-invalid-regexp))
@@ -1634,7 +1634,7 @@ If there is no completion possible, say so and continue searching."
 
 ;;; Called when opening an overlay, and we are still in isearch.
 (defun isearch-open-overlay-temporary (ov)
-  (if (not (null (overlay-get ov 'isearch-open-invisible-temporary))) 
+  (if (not (null (overlay-get ov 'isearch-open-invisible-temporary)))
       ;; Some modes would want to open the overlays temporary during
       ;; isearch in their own way, they should set the
       ;; `isearch-open-invisible-temporary' to a function doing this.
@@ -1657,7 +1657,7 @@ If there is no completion possible, say so and continue searching."
 ;;; point returns to the original location which surely is not contain
 ;;; in any of these overlays, se we are safe in this case too.
 (defun isearch-open-necessary-overlays (ov)
-  (let ((inside-overlay (and  (> (point) (overlay-start ov)) 
+  (let ((inside-overlay (and  (> (point) (overlay-start ov))
 			      (< (point) (overlay-end ov))))
 	;; If this exists it means that the overlay was opened using
 	;; this function, not by us tweaking the overlay properties.
@@ -1722,7 +1722,7 @@ If there is no completion possible, say so and continue searching."
 	       (can-be-opened (eq search-invisible 'open))
 	       ;; the list of overlays that could be opened
 	       (crt-overlays nil))
-	   (when (and can-be-opened isearch-hide-immediately) 
+	   (when (and can-be-opened isearch-hide-immediately)
 	     (isearch-close-unnecessary-overlays beg end))
 	   ;; If the following character is currently invisible,
 	   ;; skip all characters with that same `invisible' property value.
@@ -1735,7 +1735,7 @@ If there is no completion possible, say so and continue searching."
 			   (or (memq prop buffer-invisibility-spec)
 			       (assq prop buffer-invisibility-spec)))))
 	     (if (get-text-property (point) 'invisible)
-		 (progn 
+		 (progn
 		   (goto-char (next-single-property-change (point) 'invisible
 							   nil end))
 		   ;; if text is hidden by an `invisible' text property
@@ -1760,7 +1760,7 @@ If there is no completion possible, say so and continue searching."
 			   ;; cannot be opened.
 			   (setq can-be-opened nil)))
 		     (setq overlays (cdr overlays)))
-		   (if can-be-opened 
+		   (if can-be-opened
 		       ;; It makes sense to append to the open
 		       ;; overlays list only if we know that this is
 		       ;; t.
@@ -1806,7 +1806,7 @@ If there is no completion possible, say so and continue searching."
   "Return t if there are no upper case chars in STRING.
 If REGEXP-FLAG is non-nil, disregard letters preceded by `\\' (but not `\\\\')
 since they have special meaning in a regexp."
-  (let (quote-flag (i 0) (len (length string)) found) 
+  (let (quote-flag (i 0) (len (length string)) found)
     (while (and (not found) (< i len))
       (let ((char (aref string i)))
 	(if (and regexp-flag (eq char ?\\))
@@ -2069,5 +2069,5 @@ CASE-FOLD non-nil means the search was case-insensitive."
 	isearch-message message
 	isearch-case-fold-search case-fold)
   (isearch-search))
-	
+
 ;;; isearch.el ends here