diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-06 19:26:28 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-04-06 19:27:00 -0700 |
| commit | cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e (patch) | |
| tree | e094071e0ac90a45a455679ea98ecea9764997a6 | |
| parent | cd0a7951fb762570c4b9c2cdbb43c94cb68910d4 (diff) | |
| download | emacs-cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e.tar.gz emacs-cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e.tar.bz2 emacs-cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e.zip | |
; Spelling and punctuation fixes
| -rw-r--r-- | doc/lispref/objects.texi | 4 | ||||
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/textmodes/mhtml-mode.el | 2 | ||||
| -rw-r--r-- | test/lisp/textmodes/mhtml-mode-tests.el | 8 |
4 files changed, 10 insertions, 10 deletions
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index cc9320987f2..1f4c378df18 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi @@ -1363,8 +1363,8 @@ types that are not built into Emacs. @node Type Descriptors @subsection Type Descriptors - A @dfn{type decriptor} is a @code{record} which holds information -about a type. Slot 1 in the record must be a symbol naming the type. + A @dfn{type descriptor} is a @code{record} which holds information +about a type. Slot 1 in the record must be a symbol naming the type, and @code{type-of} relies on this to return the type of @code{record} objects. No other type descriptor slot is used by Emacs; they are free for use by Lisp extensions. @@ -771,7 +771,7 @@ processes on exit. ** HTML +++ -*** A new submode of `html-mode', `mthml-mode', is now the default +*** A new submode of 'html-mode', 'mhtml-mode', is now the default mode for *.html files. This mode handles indentation, fontification, and commenting for embedded JavaScript and CSS. @@ -785,9 +785,9 @@ similarly but it doesn't prepend a '.'. +++ ** Certain cond/pcase/cl-case forms are now compiled using a faster jump -table implementation. This uses a new bytecode op `switch', which isn't +table implementation. This uses a new bytecode op 'switch', which isn't compatible with previous Emacs versions. This functionality can be disabled -by setting `byte-compile-cond-use-jump-table' to nil. +by setting 'byte-compile-cond-use-jump-table' to nil. +++ ** Resizing a frame no longer runs 'window-configuration-change-hook'. diff --git a/lisp/textmodes/mhtml-mode.el b/lisp/textmodes/mhtml-mode.el index e9e09d4d959..a0fa8492cf4 100644 --- a/lisp/textmodes/mhtml-mode.el +++ b/lisp/textmodes/mhtml-mode.el @@ -91,7 +91,7 @@ code(); (funcall mode) ;; Make sure font lock is all set up. (font-lock-set-defaults) - ;; This has to be set to a value other than the mthml-mode + ;; This has to be set to a value other than the mhtml-mode ;; value, to avoid recursion. (unless (variable-binding-locus 'font-lock-fontify-region-function) (setq-local font-lock-fontify-region-function diff --git a/test/lisp/textmodes/mhtml-mode-tests.el b/test/lisp/textmodes/mhtml-mode-tests.el index d8eeb27643c..020ad03c18f 100644 --- a/test/lisp/textmodes/mhtml-mode-tests.el +++ b/test/lisp/textmodes/mhtml-mode-tests.el @@ -35,22 +35,22 @@ (font-lock-ensure) (should (eq (syntax-ppss-context (syntax-ppss)) what)))) -(ert-deftest mthml-comment-js () +(ert-deftest mhtml-comment-js () (mhtml-test-syntax "<html><script>\n/* " " some text */<script></html>" 'comment)) -(ert-deftest mthml-string-js () +(ert-deftest mhtml-string-js () (mhtml-test-syntax "<html><script>\n\" " " some text \"<script></html>" 'string)) -(ert-deftest mthml-comment-css () +(ert-deftest mhtml-comment-css () (mhtml-test-syntax "<html><style>\n/* " " some text */<style></html>" 'comment)) -(ert-deftest mthml-string-css () +(ert-deftest mhtml-string-css () (mhtml-test-syntax "<html><style>\n\" " " some text \"<style></html>" 'string)) |