Merge from origin/emacs-25

[gnu-emacs] / lisp / erc / erc-spelling.el

diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 6e8fe5649d6688fb047b7ba238d069a18d05caf9..f0eadf52db6e3b5da3b2d2d4fb1a988dcd7c8e19 100644 (file)
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -1,8 +1,9 @@
 ;;; erc-spelling.el --- use flyspell in ERC
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2005-2016 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: irc
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcSpelling
 
@@ -70,7 +71,7 @@ The current buffer is given by BUFFER."
               (if dicts
                   (cadr (car dicts))
                 (erc-with-server-buffer ispell-local-dictionary)))))
-    (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify)
+    (setq flyspell-generic-check-word-predicate #'erc-spelling-flyspell-verify)
     (flyspell-mode 1)))
 
 (defun erc-spelling-unhighlight-word (word)
@@ -84,6 +85,7 @@ The cadr is the beginning and the caddr is the end."
 
 (defun erc-spelling-flyspell-verify ()
   "Flyspell only the input line, nothing else."
+  ;; FIXME: Don't use `flyspell-word'!
   (let ((word-data (and (boundp 'flyspell-word)
                         flyspell-word)))
     (when word-data
@@ -106,5 +108,4 @@ The cadr is the beginning and the caddr is the end."
 
 (provide 'erc-spelling)
 
-;; arch-tag: 04ae1c46-0fd1-4e1a-8b80-55bfa471c945
 ;;; erc-spelling.el ends here