(mail-mode-flyspell-verify):

Check message-signature-separator exists before using it.

2 files changed, 16 insertions, 9 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66baf0d960c..7e310e10c33 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,17 +1,22 @@
+2008-06-13  David Reitter  <david.reitter@gmail.com>
+
+        * textmodes/flyspell.el (mail-mode-flyspell-verify):
+        Check message-signature-separator exists before using it.
+
 2008-06-13  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * vc.el (vc-delete-file): Bind default-directory before calling
         the backend.
         (vc-annotate-show-diff-revision-at-line): Move most of the code to ...
-        (vc-annotate-show-diff-revision-at-line-internal): ... here.  New
-        function.
+        (vc-annotate-show-diff-revision-at-line-internal): ... here.
+        New function.
         (vc-annotate-show-changeset-diff-revision-at-line): New function.
         (vc-annotate-mode-menu): Bind it.
 
 2008-06-13  Jason Rumney  <jasonr@gnu.org>
 
-        * term/w32-win.el (mouse-set-font): Remove overridden function.
-        (w32-select-font): Declare as obsolete alias for x-select-font.
+        * term/w32-win.el (mouse-set-font): Remove overridden function.
+        (w32-select-font): Declare as obsolete alias for x-select-font.
 
 2008-06-13  Daniel Engeler  <engeler@gmail.com>
 
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 0267dfda7ca..6e78096328e 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -306,11 +306,13 @@ property of the major mode name.")
                                "$")
                        nil t)
                       (point)))
-        (signature-begin (save-excursion
-                           (goto-char (point-max))
-                           (re-search-backward message-signature-separator
-                                               nil t)
-                           (point))))
+        (signature-begin
+         (if (not (boundp 'message-signature-separator))
+             (point-max)
+           (save-excursion
+             (goto-char (point-max))
+             (re-search-backward message-signature-separator nil t)
+             (point)))))
     (cond ((< (point) header-end)
            (and (save-excursion (beginning-of-line)
                                 (looking-at "^Subject:"))