3 files changed, 9 insertions, 4 deletions
diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el
index 8df251276b5..09da155f487 100644
--- a/lisp/textmodes/mhtml-mode.el
+++ b/lisp/textmodes/mhtml-mode.el
@@ -198,6 +198,12 @@ smallest."
                   (get-text-property orig-end 'mhtml-submode))
         (cl-decf font-lock-end)))
 
+    ;; Also handle the multiline property -- but handle it here, and
+    ;; not via font-lock-extend-region-functions, to avoid the
+    ;; situation where the two extension functions disagree.
+    ;; See bug#29159.
+    (font-lock-extend-region-multiline)
+
     (or (/= font-lock-beg orig-beg)
         (/= font-lock-end orig-end))))
 
@@ -365,8 +371,7 @@ the rules from `css-mode'."
   (setq-local font-lock-fontify-region-function
               #'mhtml--submode-fontify-region)
   (setq-local font-lock-extend-region-functions
-              '(mhtml--extend-font-lock-region
-                font-lock-extend-region-multiline))
+              '(mhtml--extend-font-lock-region))
 
   ;; Attach this to both pre- and post- hooks just in case it ever
   ;; changes a key binding that might be accessed from the menu bar.
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index eb7068f3d03..82cb2d4dc05 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -195,7 +195,7 @@ Puts a full-stop before comments on a line by themselves."
 			      9) 8)))))) ; add 9 to ensure at least two blanks
       (goto-char pt))))
 
-;; https://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01869.html
+;; https://lists.gnu.org/r/emacs-devel/2007-10/msg01869.html
 (defun nroff-insert-comment-function ()
   "Function for `comment-insert-comment-function' in `nroff-mode'."
   (indent-to (nroff-comment-indent))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 10ee10243ad..5c585ea46ca 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1792,7 +1792,7 @@ Mark is left at original location."
 ;; Note this does not handle things like mismatched brackets inside
 ;; begin/end blocks.
 ;; Needs to handle escaped parens for tex-validate-*.
-;; https://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00038.html
+;; https://lists.gnu.org/r/bug-gnu-emacs/2007-09/msg00038.html
 ;; Does not handle escaped parens when latex-handle-escaped-parens is nil.
 (defun latex-forward-sexp-1 ()
   "Like (forward-sexp 1) but aware of multi-char elements and escaped parens."