diff options
| -rw-r--r-- | lisp/files.el | 6 | ||||
| -rw-r--r-- | lisp/net/eww.el | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lisp/files.el b/lisp/files.el index 0a023a88b10..bf48bce3b0d 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2424,7 +2424,7 @@ since only a single case-insensitive search through the alist is made." (lambda (elt) (cons (purecopy (car elt)) (cdr elt))) `(;; do this first, so that .html.pl is Polish html, not Perl - ("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) + ("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . mhtml-mode) ("\\.svgz?\\'" . image-mode) ("\\.svgz?\\'" . xml-mode) ("\\.x[bp]m\\'" . image-mode) @@ -2786,8 +2786,8 @@ If FUNCTION is nil, then it is not called. (That is a way of saying comment-re "*" "\\(?:!DOCTYPE[ \t\r\n]+[^>]*>[ \t\r\n]*<[ \t\r\n]*" comment-re "*\\)?" "[Hh][Tt][Mm][Ll]")) - . html-mode) - ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . html-mode) + . mhtml-mode) + ("<!DOCTYPE[ \t\r\n]+[Hh][Tt][Mm][Ll]" . mhtml-mode) ;; These two must come after html, because they are more general: ("<\\?xml " . xml-mode) (,(let* ((incomment-re "\\(?:[^-]\\|-[^-]\\)") diff --git a/lisp/net/eww.el b/lisp/net/eww.el index 619c703e01c..fe316579142 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -641,8 +641,11 @@ Currently this means either text/html or application/xhtml+xml." (when (coding-system-p cs) (decode-coding-region (point-min) (point-max) cs) (setq buffer-file-coding-system last-coding-system-used)))) - (when (fboundp 'html-mode) - (html-mode)))) + (cond + ((fboundp 'mhtml-mode) + (mhtml-mode)) + ((fboundp 'html-mode) + (html-mode))))) (view-buffer buf))) (defun eww-toggle-paragraph-direction () |