Merge from origin/emacs-25

[gnu-emacs] / ChangeLog.2

diff --git a/ChangeLog.2 b/ChangeLog.2
index bc09faf6508b1c0bf704421389fab9b065d49bd9..04ecc82901e8673bbdcd2ddeeb11a49d029c3e16 100644 (file)
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -21251,7 +21251,7 @@
 
 2015-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
-       terminal-init-w32console mimicks command-line
+       terminal-init-w32console mimics command-line
        Problem reported by Eli Zaretskii.
        * lisp/startup.el (startup--setup-quote-display):
        New function, refactored from a part of ‘command-line’.