XEmacs 21.2.36 "Notos"

[chise/xemacs-chise.git-] / lisp / isearch-mode.el

diff --git a/lisp/isearch-mode.el b/lisp/isearch-mode.el
index 3eef6c9..492bacd 100644 (file)
--- a/lisp/isearch-mode.el
+++ b/lisp/isearch-mode.el
@@ -533,7 +533,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
          isearch-opoint (point)
          search-ring-yank-pointer nil
          regexp-search-ring-yank-pointer nil
-         isearch-opened-extents nil
+         isearch-unhidden-extents nil
          isearch-window-configuration (current-window-configuration)
 
          ;; #### What we really need is a buffer-local
@@ -1210,7 +1210,8 @@ Obsolete."
       (set yank-pointer-name
           (setq yank-pointer
                 (mod (+ (or yank-pointer 0)
-                        (if advance -1 1))
+                        ;; XEmacs change
+                        (if advance -1 (if yank-pointer 1 0)))
                      length)))
       (setq isearch-string (nth yank-pointer ring)
            isearch-message (mapconcat 'isearch-text-char-description
@@ -1339,7 +1340,7 @@ If there is no completion possible, say so and continue searching."
 (defun isearch-top-state ()
   (let ((cmd (car isearch-cmds)))
     ;; #### Grr, this is so error-prone.  If you add something to
-    ;; isearch-push-state, don't forget to update this.  I thout I'd
+    ;; isearch-push-state, don't forget to update this.  I thought I'd
     ;; make a list of variables, and just do (mapcar* #'set vars
     ;; values), but the (point) thing would spoil it, leaving to more
     ;; complication.
@@ -1604,7 +1605,7 @@ If there is no completion possible, say so and continue searching."
 
 (defun isearch-make-extent (begin end)
   (let ((x (make-extent begin end (current-buffer))))
-    ;; make the isearch extent always take prescedence over any mouse-
+    ;; make the isearch extent always take precedence over any mouse-
     ;; highlighted extents we may be passing through, since isearch, being
     ;; modal, is more interesting (there's nothing they could do with a
     ;; mouse-highlighted extent while in the midst of a search anyway).
@@ -1883,8 +1884,7 @@ uppercase letters and `search-caps-disable-folding' is t."
   ;; buffer.
   (mapc #'delete-extent isearch-highlight-extents)
   (setq isearch-highlight-extents nil)
-  (setq isearch-highlight-all-start nil
-       isearch-window-end nil
+  (setq isearch-window-end nil
        isearch-highlight-last-string nil))
 
 (defun isearch-highlight-all-update ()
@@ -1914,7 +1914,7 @@ uppercase letters and `search-caps-disable-folding' is t."
 
           ;; It would be nice if we didn't have to do this; however,
           ;; window-start doesn't support a GUARANTEE flag, so we must
-          ;; force redisplay to get the correct valye for start and end
+          ;; force redisplay to get the correct value for start and end
           ;; of window.
           (sit-for 0)