Commit 1a07b12a authored by Glenn Morris's avatar Glenn Morris

Merge from origin/emacs-26

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

# Conflicts:
#	ChangeLog.3
#	lisp/textmodes/mhtml-mode.el
parents ff406671 f1ce72b7
This diff is collapsed.
This diff is collapsed.
......@@ -23,12 +23,10 @@
(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.
(declare-function flyspell-generic-progmode-verify "flyspell")
(defun mhtml--flyspell-check-word ()
(let ((submode (get-text-property (point) 'mhtml-submode)))
(if submode
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment