ChangeLog fix

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 83f824edef09731bae4822b8e6d84d78c51509ad..f79c8f0e692dbb3a4d430d7ee53a9c7e5a8d83a1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -37,31 +37,32 @@
        * subr.el (read-quoted-char): Remove unused local variable `char'.
 
 2013-07-07  Michael Kifer  <kifer@cs.stonybrook.edu>
-            Stefan Monnier  <monnier@iro.umontreal.ca>
 
-       * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook.
-
-       * viper.el (viper-emacs-state-mode-list): Add egg-status-buffer-mode.
-       (viper-version): Version update.
-       (viper-go-away, viper-setup-hooks): Function changed.
-       (viper--lookup-key, viper-catch-tty-ESC, viper-uncatch-tty-ESC)
-       (viper-setup-ESC-to-escape): New functions.
+       * ediff.el (ediff-version): Version update.
+       (ediff-files-command, ediff3-files-command, ediff-merge-command)
+       (ediff-merge-with-ancestor-command, ediff-directories-command)
+       (ediff-directories3-command, ediff-merge-directories-command)
+       (ediff-merge-directories-with-ancestor-command): New functions.
+       All are command-line interfaces to ediff: to facilitate calling
+       Emacs with the appropriate ediff functions invoked.
 
        * viper-cmd.el (viper-del-forward-char-in-insert): New function.
        (viper-save-kill-buffer): Check if buffer is modified.
-       (viper-envelop-ESC-key): Function deleted.
-       (viper-intercept-ESC-key): Function changed.
 
-       * viper-keym.el (viper-ESC-key): Constant changed.
+       * viper.el (viper-version): Version update.
+       (viper-emacs-state-mode-list): Add egg-status-buffer-mode.
 
-       * ediff.el (ediff-files-command, ediff3-files-command): New functions.
-       (ediff-merge-command, ediff-merge-with-ancestor-command): New functions.
-       (ediff-directories-command, ediff-directories3-command): New functions.
-       (ediff-merge-directories-command): New function.
-       (ediff-merge-directories-with-ancestor-command): New function.
-       All the above are command-line interfaces to ediff: facilitate calling
-       Emacs with the appropriate ediff functions invoked.
-       (ediff-version): Version update.
+2013-07-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * faces.el (tty-run-terminal-initialization): Run new tty-setup-hook.
+       * viper-cmd.el (viper-envelop-ESC-key): Remove function.
+       (viper-intercept-ESC-key): Simplify.
+       * viper-keym.el (viper-ESC-key): Make it a constant, don't use kbd.
+       * viper.el (viper--tty-ESC-filter, viper--lookup-key)
+       (viper-catch-tty-ESC, viper-uncatch-tty-ESC)
+       (viper-setup-ESC-to-escape): New functions.
+       (viper-go-away, viper-set-hooks): Call viper-setup-ESC-to-escape.
+       (viper-set-hooks): Do not modify flyspell-mode-hook.  (Bug#13793)
 
 2013-07-07  Eli Zaretskii  <eliz@gnu.org>