* test/automated/simple-test.el: Add test for bug#20698 (bug#21885)

[gnu-emacs] / lisp / ChangeLog.16

diff --git a/lisp/ChangeLog.16 b/lisp/ChangeLog.16
index bf8a97352c6a55edcf3dd0c098c58b2db2b3acb6..bc5267aadba8c93147cbbfa952228c04b760faa2 100644 (file)
--- a/lisp/ChangeLog.16
+++ b/lisp/ChangeLog.16
@@ -5030,8 +5030,7 @@
        * mouse.el (mouse-yank-primarY): Look for frame-type w32, not
        system-type windows-nt.
 
-       * server.el (server-create-window-system-frame): Look for window
-       type.
+       * server.el (server-create-window-system-frame): Look for window type.
        (server-proces-filter): Only force a window system when windows-nt
        _and_ w32.  Explain why.
 
@@ -15547,7 +15546,7 @@
        c-set-fl-decl-start.
 
        * progmodes/cc-mode.el (c-common-init, c-after-change):
-       Changes due to pluralisation of c-before-font-lock-functions.
+       Changes due to pluralization of c-before-font-lock-functions.
        (c-set-fl-decl-start): New function, extracted from
        c-font-lock-enclosing-decls and enhanced.