(mail-mode-flyspell-verify): Search for header separator alone on a

line, literally, and search for it backward, not forward.
(flyspell-abbrev-table): Always use global-abbrev-table if there is no
local one.

1 files changed, 4 insertions, 2 deletions

diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index dc4f521c018..e71eb440c12 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -267,7 +267,9 @@ property of the major mode name.")
 (defun mail-mode-flyspell-verify ()
   "This function is used for `flyspell-generic-check-word-p' in Mail mode."
   (let ((in-headers (save-excursion
-                      (re-search-forward mail-header-separator nil t)))
+                      ;; When mail-header-separator is "",
+                      ;; it is likely to be found in both directions.
+                      (not (re-search-backward (concat "^" (regexp-quote mail-header-separator) "$") nil t))))
         (in-signature (save-excursion
                         (re-search-backward message-signature-separator nil t))))
     (cond (in-headers
@@ -1628,7 +1630,7 @@ misspelled words backwards."
 (defun flyspell-abbrev-table ()
   (if flyspell-use-global-abbrev-table-p
       global-abbrev-table
-    local-abbrev-table))
+    (or local-abbrev-table global-abbrev-table)))
 
 ;*---------------------------------------------------------------------*/
 ;*    flyspell-define-abbrev ...                                       */