# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1258919601 0
# Node ID c85d813ab76e33a055d90bac2a2a69354fd65e48
# Parent  95389cbb5f733555e04487821bc572bf7c430471
Move entries to the correct file and fix format.

diff -r 95389cbb5f73 -r c85d813ab76e doc/misc/ChangeLog
--- a/doc/misc/ChangeLog	Sun Nov 22 18:24:29 2009 +0000
+++ b/doc/misc/ChangeLog	Sun Nov 22 19:53:21 2009 +0000
@@ -1,22 +1,3 @@
-2009-11-22  Michael Kifer  <kifer@cs.stonybrook.edu>
-	
-	* viper-cmd.el: use viper-last-command-char instead of
-	last-command-char/last-command-event.
-	(viper-prefix-arg-value): do correct conversion of event-char for
-	XEmacs.
-	
-	* viper-util.el, viper.el: use viper-last-command-char instead of
-	last-command-char/last-command-event.
-
-	* ediff-init.el, ediff-mult.el, ediff-util.el: relpace
-	last-command-char and last-command-event with (ediff-last-command-char) everywhere.
-	
-	* ediff-vers.el (ediff-rcs-get-output-buffer): make sure the buffer is
-	created in fundamental mode.
-	
-	* ediff.el (ediff-version): revert the change of interactive-p to
-	called-interactively-p.
-	
 2009-11-22  Jay Belanger  <jay.p.belanger@gmail.com>
 
 	* calc.texi (Radix modes): Discuss alternate bases for two's complement
diff -r 95389cbb5f73 -r c85d813ab76e lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Nov 22 18:24:29 2009 +0000
+++ b/lisp/ChangeLog	Sun Nov 22 19:53:21 2009 +0000
@@ -1,3 +1,23 @@
+2009-11-22  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+	* emulation/viper-cmd.el: Use viper-last-command-char instead of
+	last-command-char/last-command-event.
+	(viper-prefix-arg-value): Do correct conversion of event-char for
+	XEmacs.
+
+	* emulation/viper-util.el, emulation/viper.el: Use
+	viper-last-command-char instead of last-command-char/last-command-event.
+
+	* ediff-init.el, ediff-mult.el, ediff-util.el: Replace
+	last-command-char and last-command-event with (ediff-last-command-char)
+	everywhere.
+
+	* ediff-vers.el (ediff-rcs-get-output-buffer): Make sure the buffer is
+	created in fundamental mode.
+
+	* ediff.el (ediff-version): Revert the change of interactive-p to
+	called-interactively-p.
+
 2009-11-22  Tassilo Horn  <tassilo@member.fsf.org>
 
 	* progmodes/subword.el (subword-mode-map): Fix subword-mode-map
@@ -6006,7 +6026,7 @@
 
 2009-08-15  Michael Kifer  <kifer@cs.stonybrook.edu>
 
-	* viper-cmd.el (viper-insert-isearch-string): New function.
+	* emulation/viper-cmd.el (viper-insert-isearch-string): New function.
 	(viper-if-string): Redefine C-s in the minibuffer to insert the last
 	incremental search string.