[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 59409f4 11/12: enable mhtml-mode by default
From: |
Tom Tromey |
Subject: |
[Emacs-diffs] master 59409f4 11/12: enable mhtml-mode by default |
Date: |
Wed, 5 Apr 2017 18:17:31 -0400 (EDT) |
branch: master
commit 59409f409d4e20b6657e8c278dba9bf403c5ebd9
Author: Tom Tromey <address@hidden>
Commit: Tom Tromey <address@hidden>
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.
---
lisp/files.el | 6 +++---
lisp/net/eww.el | 7 +++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index 204c264..6848818 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 "\\(?:[^-]\\|-[^-]\\)")
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 619c703..fe31657 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 ()
- [Emacs-diffs] master c92bae9 04/12: change org to use derived-mode-p, (continued)
- [Emacs-diffs] master c92bae9 04/12: change org to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master d056b1f 03/12: change semantic to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 089b159 02/12: change calc to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 5331ef8 08/12: make js.el respect prog-first-column, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 14659f6 06/12: change viper to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 95aba61 05/12: change align to use derived-mode-p, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 473a420 07/12: make smie.el respect prog-first-column, Tom Tromey, 2017/04/05
- [Emacs-diffs] master d392b6e 09/12: change sgml-mode to help multi-html mode, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 04a5ce0 12/12: add two more mhtml tests, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 335174e 10/12: add mhtml-mode.el, Tom Tromey, 2017/04/05
- [Emacs-diffs] master 59409f4 11/12: enable mhtml-mode by default,
Tom Tromey <=