commit 67aeaa74af8504f950f653136d749c6dd03a60de (HEAD, refs/remotes/origin/master) Author: Lars Brinkhoff Date: Fri Apr 7 06:56:52 2017 +0200 * records.texi (Record Functions): fix typo. diff --git a/doc/lispref/records.texi b/doc/lispref/records.texi index a924bafbb9..2533a8a4ca 100644 --- a/doc/lispref/records.texi +++ b/doc/lispref/records.texi @@ -56,7 +56,7 @@ and remaining slots are the rest of the arguments, @var{objects}. @example @group -(vector 'foo 23 [bar baz] "rats") +(record 'foo 23 [bar baz] "rats") @result{} #s(foo 23 [bar baz] "rats") @end group @end example commit 2012839a53a5c4877832e2b09091ce28ea29abc4 Author: Paul Eggert Date: Thu Apr 6 20:02:15 2017 -0700 More casefiddle minor fixes * src/casefiddle.c (case_character_impl): Omit unnecessary casts. (case_character_impl): Avoid reevaluation of CHAR_TABLE_REF. (GREEK_CAPITAL_LETTER_SIGMA): Fix typo in my previous change. diff --git a/src/casefiddle.c b/src/casefiddle.c index b7782a83c3..443d62b625 100644 --- a/src/casefiddle.c +++ b/src/casefiddle.c @@ -125,9 +125,9 @@ case_character_impl (struct casing_str_buf *buf, } /* Look through the special casing entries. */ - if (buf && !NILP (ctx->specialcase_char_tables[(int)flag])) + if (buf && !NILP (ctx->specialcase_char_tables[flag])) { - prop = CHAR_TABLE_REF (ctx->specialcase_char_tables[(int)flag], ch); + prop = CHAR_TABLE_REF (ctx->specialcase_char_tables[flag], ch); if (STRINGP (prop)) { struct Lisp_String *str = XSTRING (prop); @@ -144,12 +144,21 @@ case_character_impl (struct casing_str_buf *buf, /* Handle simple, one-to-one case. */ if (flag == CASE_DOWN) cased = downcase (ch); - else if (!NILP (ctx->titlecase_char_table) - && CHARACTERP (prop - = CHAR_TABLE_REF (ctx->titlecase_char_table, ch))) - cased = XFASTINT (prop); else - cased = upcase (ch); + { + bool cased_is_set = false; + if (!NILP (ctx->titlecase_char_table)) + { + prop = CHAR_TABLE_REF (ctx->titlecase_char_table, ch); + if (CHARACTERP (prop)) + { + cased = XFASTINT (prop); + cased_is_set = true; + } + } + if (!cased_is_set) + cased = upcase (ch); + } /* And we’re done. */ done: @@ -167,7 +176,7 @@ case_character_impl (struct casing_str_buf *buf, The rule does not conflict with any other casing rules so while it is a conditional one, it is independent of language. */ -enum { GREEK_CAPITAL_LETTER_SIGMA = 0x03A }; /* Σ */ +enum { GREEK_CAPITAL_LETTER_SIGMA = 0x03A3 }; /* Σ */ enum { GREEK_SMALL_LETTER_FINAL_SIGMA = 0x03C2 }; /* ς */ /* Based on CTX, case character CH accordingly. Update CTX as necessary. commit cea942e5a6c1dbf498a2390d1fcc78ffc5908c9e Author: Paul Eggert Date: Thu Apr 6 19:26:28 2017 -0700 ; Spelling and punctuation fixes diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index cc9320987f..1f4c378df1 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. diff --git a/etc/NEWS b/etc/NEWS index 43de4b9168..aaca229d5c 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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 e9e09d4d95..a0fa8492cf 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 d8eeb27643..020ad03c18 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 "