From 0c3cc4dde115b83b9f3cb1f815ddd12404aee649 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 29 Aug 2009 14:48:10 +0000
Subject: [PATCH] (ispell-accept-output, ispell-command-loop): Use
 with-current-buffer.

---
 lisp/ChangeLog           |  3 +++
 lisp/textmodes/ispell.el | 14 +++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 528538545de..f2743ad1ee8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-08-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* textmodes/ispell.el (ispell-accept-output, ispell-command-loop):
+	Use with-current-buffer.
+
 	* emacs-lisp/bytecomp.el (byte-compile-const-symbol-p):
 	Recognize immutable variables like most-positive-fixnum.
 	(byte-compile-setq-default): Check and warn if trying to assign
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index d8e89eb4b9d..c5beda5554a 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1522,13 +1522,11 @@ pass it the output of the last ispell invocation."
 	    ispell-output)
 	(if (not (bufferp buf))
 	    (setq ispell-filter nil)
-	  (save-excursion
-	    (set-buffer buf)
+	  (with-current-buffer buf
 	    (setq ispell-output (buffer-substring-no-properties
 				 (point-min) (point-max))))
 	  (ispell-filter t ispell-output)
-	  (save-excursion
-	    (set-buffer buf)
+	  (with-current-buffer buf
 	    (erase-buffer)))))))
 
 (defun ispell-send-replacement (misspelled replacement)
@@ -1871,8 +1869,7 @@ Global `ispell-quit' set to start location to continue spell session."
 	char num result textwin dedicated-win)
 
     ;; setup the *Choices* buffer with valid data.
-    (save-excursion
-      (set-buffer (get-buffer-create ispell-choices-buffer))
+    (with-current-buffer (get-buffer-create ispell-choices-buffer)
       (setq mode-line-format
 	    (concat "--  %b  --  word: " word
 		    "  --  dict: " (or ispell-current-dictionary "default")
@@ -2038,9 +2035,8 @@ Global `ispell-quit' set to start location to continue spell session."
 				     word)))
 		      (if new-word
 			  (progn
-			    (save-excursion
-			      (set-buffer (get-buffer-create
-					   ispell-choices-buffer))
+			    (with-current-buffer (get-buffer-create
+                                                  ispell-choices-buffer)
 			      (erase-buffer)
 			      (setq count ?0
 				    skipped 0
-- 
2.39.2