From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 27 Aug 2007 16:26:48 +0000 (+0000)
Subject: (flyspell-mode): Catch errors in flyspell-mode-on.
X-Git-Tag: emacs-pretest-22.1.90~889
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=478adae212a3336e00622934b8c869b07001a396;p=emacs.git

(flyspell-mode): Catch errors in flyspell-mode-on.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02011db6695..69fb14c19f5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-27  Richard Stallman  <rms@gnu.org>
+
+	* textmodes/flyspell.el (flyspell-mode):
+	Catch errors in flyspell-mode-on.
+
 2007-08-27  Thien-Thi Nguyen  <ttn@gnuvola.org>
 
 	* progmodes/modula2.el (m2-definition, m2-module):
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 0b5dfa4cc54..63be4f8277f 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -485,7 +485,10 @@ in your .emacs file.
   :keymap flyspell-mode-map
   :group 'flyspell
   (if flyspell-mode
-      (flyspell-mode-on)
+      (condition-case ()
+	  (flyspell-mode-on)
+	(error (message "Enabling Flyspell mode gave an error")
+	       (flyspell-mode -1)))
     (flyspell-mode-off)))
 
 ;;;###autoload