(flyspell-external-point-words): Use save-excursion to ensure we don't

move backward in the search loop, not even one character.
(flyspell-delete-all-overlays): Use remove-overlays directly.

diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 402a399579559119039b4a7e2cee97be6fc453a8..4bea438bf2b7470812689e393b5592adbed83ef6 100644 (file)
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1332,10 +1332,9 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
              (while keep
                (if (search-forward word
                                    flyspell-large-region-end t)
-                   (progn
+                   (save-excursion
                      (goto-char (- (point) 1))
-                     (let* ((match-point (point)) ; flyspell-get-word might move it
-                            (flyword-prev-l (flyspell-get-word nil))
+                     (let* ((flyword-prev-l (flyspell-get-word nil))
                             (flyword-prev (car flyword-prev-l))
                             (size-match (= (length flyword-prev) (length word))))
                        (when (or
@@ -1362,7 +1361,7 @@ The buffer to mark them in is `flyspell-large-region-buffer'."
                          (setq keep nil)
                          (flyspell-word)
                          ;; Next search will begin from end of last match
-                         (setq flyspell-large-region-beg match-point))))
+                         )))
                  ;; Record if misspelling is not found and try new one
                  (add-to-list 'words-not-found
                               (concat " -> " word " - "
@@ -1558,7 +1557,7 @@ FLYSPELL-BUFFER."
 
 (defun flyspell-delete-all-overlays ()
   "Delete all the overlays used by flyspell."
-  (flyspell-delete-region-overlays (point-min) (point-max)))
+  (remove-overlays (point-min) (point-max) 'flyspell-overlay t))
 
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-unhighlight-at ...                                      */