(ispell-kill-ispell-hook): Add to the hook when

loading the file rather than when turning on flyspell-mode.

lisp/ChangeLog

+2006-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/flyspell.el (ispell-kill-ispell-hook): Add to the hook when
+	loading the file rather than when turning on flyspell-mode.
+
 2006-01-13  Richard M. Stallman  <rms@gnu.org>
 	* font-lock.el (lisp-font-lock-keywords-1): Minor rearrangement.
@@ -54,11 +59,9 @@
 	* time.el (display-time-mail-face): Replace :group `faces' with
 	`mode-line-faces'.
->>>>>>> 1.8983
 2006-01-16  Kenichi Handa  <handa@m17n.org>
-	* international/code-pages.el: Add autoload cookies for
-	cp125[0345678].
+	* international/code-pages.el: Add autoload cookies for cp125[0345678].
 	* language/european.el (cp1252): New alias for windows-1252.
@@ -78,8 +81,8 @@
 	(term-reset-terminal): Reset the scroll region.
 	(term-handle-ansi-escape): Cursor up and down should take into
 	account the scroll region.
-	(term-set-scroll-region): Renamed from `term-scroll-region'.  Move
-	to 0,0 after setting the region.
+	(term-set-scroll-region): Rename from `term-scroll-region'.
+	Move to 0,0 after setting the region.
 	(term-handle-scroll): Handle scroll up.
 	(term-down): Fix off by one error.
 	(term-delete-lines): Do not delete outside the scroll region.
@@ -103,7 +106,6 @@
 	(Custom-reset-saved): Do not ask for confirmation in single option
 	buffers.
->>>>>>> 1.8978
 2006-01-13  Romain Francoise  <romain@orebokech.com>
 	* add-log.el (add-change-log-entry, change-log-merge):

lisp/textmodes/flyspell.el

@@ -531,6 +531,11 @@ in your .emacs file.
     (with-current-buffer buf
       (kill-local-variable 'flyspell-word-cache-word))))
 
+;; Make sure we flush our caches when needed.  Do it here rather than in
+;; flyspell-mode-on, since flyspell-region may be used without ever turning
+;; on flyspell-mode.
+(add-hook 'ispell-kill-ispell-hook 'flyspell-kill-ispell-hook)
+
 ;;*---------------------------------------------------------------------*/
 ;;*    flyspell-mode-on ...                                             */
 ;;*---------------------------------------------------------------------*/
@@ -542,8 +547,6 @@ in your .emacs file.
   (or ispell-local-dictionary ispell-dictionary
       (if flyspell-default-dictionary
 	  (ispell-change-dictionary flyspell-default-dictionary)))
-  ;; Make sure we flush our caches when needed.
-  (add-hook 'ispell-kill-ispell-hook 'flyspell-kill-ispell-hook)
   ;; we have to force ispell to accept the local definition or
   ;; otherwise it could be too late, the local dictionary may
   ;; be forgotten!