Sync to HEAD

[bpt/emacs.git] / lisp / textmodes / flyspell.el

diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 9d553a6..3d41042 100644 (file)
--- 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
@@ -1349,7 +1351,7 @@ Word syntax described by `ispell-dictionary-alist' (which see)."
                                               ispell-personal-dictionary)))))
                      (setq args (append args ispell-extra-args))
                      args))))
-      (if (= c 0)
+      (if (eq c 0)
          (flyspell-external-point-words)
        (error "Can't check region...")))))
 
@@ -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 ...                                       */
@@ -2123,4 +2125,5 @@ This function is meant to be added to 'flyspell-incorrect-hook'."
 
 (provide 'flyspell)
 
+;;; arch-tag: 05d915b9-e9cf-44fb-9137-fc28f5eaab2a
 ;;; flyspell.el ends here