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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 02011db669539219d89399cba6bb959b6fa114b5..69fb14c19f5d00793442fc2fc3ac62a6bb9deecc 100644 (file)
--- 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 0b5dfa4cc54ba30fc93648de75a6e926a615a470..63be4f8277f06ed692f7986937b07f855e6165e8 100644 (file)
--- 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