Merge from origin/emacs-26

f1ce72b ; ChangeLog.3 update
5b59cf0 * etc/AUTHORS: Update.
2cf20b6 * lisp/textmodes/mhtml-mode.el: Avoid loading flyspell.  (Bug...

# Conflicts:
#	ChangeLog.3
#	lisp/textmodes/mhtml-mode.el

1 files changed, 2 insertions, 2 deletions

diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 4c125ab2c67..7de24c783f0 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -23,12 +23,10 @@
 
 (eval-and-compile
   (require 'cl-lib)
-  (require 'flyspell)
   (require 'sgml-mode))
 (require 'js)
 (require 'css-mode)
 (require 'prog-mode)
-(require 'font-lock)
 
 (defcustom mhtml-tag-relative-indent t
   "How <script> and <style> bodies are indented relative to the tag.
@@ -350,6 +348,8 @@ This is used by `mhtml--pre-command'.")
       ;; HTML.
       (sgml-indent-line))))
 
+(declare-function flyspell-generic-progmode-verify "flyspell")
+
 (defun mhtml--flyspell-check-word ()
   (let ((submode (get-text-property (point) 'mhtml-submode)))
     (if submode