diff options
| author | Paul Eggert | 2017-04-06 19:26:28 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-04-06 19:27:00 -0700 |
| commit | cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e (patch) | |
| tree | e094071e0ac90a45a455679ea98ecea9764997a6 | |
| parent | cd0a7951fb762570c4b9c2cdbb43c94cb68910d4 (diff) | |
| download | emacs-cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e.tar.gz 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. | |||
| 1363 | @node Type Descriptors | 1363 | @node Type Descriptors |
| 1364 | @subsection Type Descriptors | 1364 | @subsection Type Descriptors |
| 1365 | 1365 | ||
| 1366 | A @dfn{type decriptor} is a @code{record} which holds information | 1366 | A @dfn{type descriptor} is a @code{record} which holds information |
| 1367 | about a type. Slot 1 in the record must be a symbol naming the type. | 1367 | about a type. Slot 1 in the record must be a symbol naming the type, and |
| 1368 | @code{type-of} relies on this to return the type of @code{record} | 1368 | @code{type-of} relies on this to return the type of @code{record} |
| 1369 | objects. No other type descriptor slot is used by Emacs; they are | 1369 | objects. No other type descriptor slot is used by Emacs; they are |
| 1370 | free for use by Lisp extensions. | 1370 | free for use by Lisp extensions. |
| @@ -771,7 +771,7 @@ processes on exit. | |||
| 771 | ** HTML | 771 | ** HTML |
| 772 | 772 | ||
| 773 | +++ | 773 | +++ |
| 774 | *** A new submode of `html-mode', `mthml-mode', is now the default | 774 | *** A new submode of 'html-mode', 'mhtml-mode', is now the default |
| 775 | mode for *.html files. This mode handles indentation, | 775 | mode for *.html files. This mode handles indentation, |
| 776 | fontification, and commenting for embedded JavaScript and CSS. | 776 | fontification, and commenting for embedded JavaScript and CSS. |
| 777 | 777 | ||
| @@ -785,9 +785,9 @@ similarly but it doesn't prepend a '.'. | |||
| 785 | 785 | ||
| 786 | +++ | 786 | +++ |
| 787 | ** Certain cond/pcase/cl-case forms are now compiled using a faster jump | 787 | ** Certain cond/pcase/cl-case forms are now compiled using a faster jump |
| 788 | table implementation. This uses a new bytecode op `switch', which isn't | 788 | table implementation. This uses a new bytecode op 'switch', which isn't |
| 789 | compatible with previous Emacs versions. This functionality can be disabled | 789 | compatible with previous Emacs versions. This functionality can be disabled |
| 790 | by setting `byte-compile-cond-use-jump-table' to nil. | 790 | by setting 'byte-compile-cond-use-jump-table' to nil. |
| 791 | 791 | ||
| 792 | +++ | 792 | +++ |
| 793 | ** Resizing a frame no longer runs 'window-configuration-change-hook'. | 793 | ** 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(); | |||
| 91 | (funcall mode) | 91 | (funcall mode) |
| 92 | ;; Make sure font lock is all set up. | 92 | ;; Make sure font lock is all set up. |
| 93 | (font-lock-set-defaults) | 93 | (font-lock-set-defaults) |
| 94 | ;; This has to be set to a value other than the mthml-mode | 94 | ;; This has to be set to a value other than the mhtml-mode |
| 95 | ;; value, to avoid recursion. | 95 | ;; value, to avoid recursion. |
| 96 | (unless (variable-binding-locus 'font-lock-fontify-region-function) | 96 | (unless (variable-binding-locus 'font-lock-fontify-region-function) |
| 97 | (setq-local font-lock-fontify-region-function | 97 | (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 @@ | |||
| 35 | (font-lock-ensure) | 35 | (font-lock-ensure) |
| 36 | (should (eq (syntax-ppss-context (syntax-ppss)) what)))) | 36 | (should (eq (syntax-ppss-context (syntax-ppss)) what)))) |
| 37 | 37 | ||
| 38 | (ert-deftest mthml-comment-js () | 38 | (ert-deftest mhtml-comment-js () |
| 39 | (mhtml-test-syntax "<html><script>\n/* " | 39 | (mhtml-test-syntax "<html><script>\n/* " |
| 40 | " some text */<script></html>" | 40 | " some text */<script></html>" |
| 41 | 'comment)) | 41 | 'comment)) |
| 42 | 42 | ||
| 43 | (ert-deftest mthml-string-js () | 43 | (ert-deftest mhtml-string-js () |
| 44 | (mhtml-test-syntax "<html><script>\n\" " | 44 | (mhtml-test-syntax "<html><script>\n\" " |
| 45 | " some text \"<script></html>" | 45 | " some text \"<script></html>" |
| 46 | 'string)) | 46 | 'string)) |
| 47 | 47 | ||
| 48 | (ert-deftest mthml-comment-css () | 48 | (ert-deftest mhtml-comment-css () |
| 49 | (mhtml-test-syntax "<html><style>\n/* " | 49 | (mhtml-test-syntax "<html><style>\n/* " |
| 50 | " some text */<style></html>" | 50 | " some text */<style></html>" |
| 51 | 'comment)) | 51 | 'comment)) |
| 52 | 52 | ||
| 53 | (ert-deftest mthml-string-css () | 53 | (ert-deftest mhtml-string-css () |
| 54 | (mhtml-test-syntax "<html><style>\n\" " | 54 | (mhtml-test-syntax "<html><style>\n\" " |
| 55 | " some text \"<style></html>" | 55 | " some text \"<style></html>" |
| 56 | 'string)) | 56 | 'string)) |