# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1137305150 0
# Node ID f00134dbd2a6fe6dbd5ef9b0ede28a9e17ba902e
# Parent  979bd3539a58288332c1d2fb40f84023a0e13cd8
(ispell-internal-change-dictionary, ispell-change-dictionary):
Undo most of last change of 2006-01-13.
(start, end): Move declaration outside of eval-when-compile.

diff -r 979bd3539a58 -r f00134dbd2a6 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Jan 15 05:47:44 2006 +0000
+++ b/lisp/ChangeLog	Sun Jan 15 06:05:50 2006 +0000
@@ -1,5 +1,9 @@
 2006-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* textmodes/ispell.el (ispell-internal-change-dictionary)
+	(ispell-change-dictionary): Undo most of last change of 2006-01-13.
+	(start, end): Move declaration outside of eval-when-compile.
+
 	* textmodes/flyspell.el (flyspell-kill-ispell-hook): New fun.
 	(flyspell-mode-on): Use it.
 
diff -r 979bd3539a58 -r f00134dbd2a6 lisp/textmodes/ispell.el
--- a/lisp/textmodes/ispell.el	Sun Jan 15 05:47:44 2006 +0000
+++ b/lisp/textmodes/ispell.el	Sun Jan 15 06:05:50 2006 +0000
@@ -202,7 +202,6 @@
 ;;; Code:
 
 (defvar mail-yank-prefix)
-(eval-when-compile (defvar flyspell-word-cache-word))
 
 ;;; Custom.el macros require recompiling this when they are not present.
 ;;; Add in backward compatible custom support.
@@ -2624,13 +2623,6 @@
 	       (setq ispell-local-dictionary dict)
 	       (setq ispell-local-dictionary-overridden t))
 	   (error "Undefined dictionary: %s" dict))
-	 ;; For global setting clear out flyspell word cache when needed
-         (when (and arg
-		    (featurep 'flyspell))
-	   (dolist (buf (buffer-list))
-	     (with-current-buffer buf
-	       (when flyspell-mode
-		 (setq flyspell-word-cache-word nil)))))
 	 (ispell-internal-change-dictionary)
 	 (message "%s Ispell dictionary set to %s"
 		  (if arg "Global" "Local")
@@ -2643,12 +2635,7 @@
   (let ((dict (or ispell-local-dictionary ispell-dictionary)))
     (unless (equal ispell-current-dictionary dict)
       (ispell-kill-ispell t)
-      (setq ispell-current-dictionary dict)
-      ;; If needed, start ispell process and clear out flyspell word cache
-      (when (and (featurep 'flyspell)
-                 flyspell-mode)
-        (ispell-init-process)
-        (setq flyspell-word-cache-word nil)))))
+      (setq ispell-current-dictionary dict))))
 
 ;;; Spelling of comments are checked when ispell-check-comments is non-nil.
 
@@ -2981,9 +2968,8 @@
 				      coding)))))
 
 ;;; Avoid error messages when compiling for these dynamic variables.
-(eval-when-compile
-  (defvar start)
-  (defvar end))
+(defvar start)
+(defvar end)
 
 (defun ispell-process-line (string shift)
   "Sends a LINE of text to ispell and processes the result.