diff options
| author | Tom Tromey <tom@tromey.com> | 2017-03-23 11:34:27 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-04-05 15:53:39 -0600 |
| commit | 59409f409d4e20b6657e8c278dba9bf403c5ebd9 (patch) | |
| tree | 5a734bfffdc1395f31099098290ba148664d2545 /lisp/files.el | |
| parent | 335174ee5037a2751c31bfd9ecb87cedb4bc3cda (diff) | |
| download | emacs-59409f409d4e20b6657e8c278dba9bf403c5ebd9.tar.gz | |
enable mhtml-mode by default
* lisp/files.el (auto-mode-alist): Reference mhtml-mode, not
html-mode.
(magic-fallback-mode-alist): Likewise.
* lisp/net/eww.el (eww-view-source): Use mthml-mode.
Diffstat (limited to 'lisp/files.el')
| -rw-r--r-- | lisp/files.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index 204c26416a6..6848818cad1 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2429,7 +2429,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) @@ -2791,8 +2791,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 "\\(?:[^-]\\|-[^-]\\)") |