*** empty log message ***

2 files changed, 3 insertions, 28 deletions

diff --git a/ChangeLog b/ChangeLog
index 7778b5364ed..fd23fce5da3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,27 +1,3 @@
-2007-11-02  Michael Kifer  <kifer@cs.stonybrook.edu>
-        
-        * viper-ex.el (viper-ex): do not ignore the region.
-        
-        * viper-cmd.el (viper-prev-destructive-command)
-        (viper-insert-prev-from-insertion-ring): use ring-copy instead of
-        copy-sequence.
-
-        * ediff-util.el (ediff-make-current-diff-overlay): do not use face-name.
-        Got rid of ediff-copy-list.
-        
-        * ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): do not
-        use face-name.
-        (ediff-test-utility,ediff-diff-mandatory-option)
-        (ediff-reset-diff-options): removed to simplify yhe mandatory option
-        handling on windows.
-        (ediff-set-diff-options): added.
-        (ediff-diff-options): changed.
-        
-        * ediff-vers.el (ediff-vc-internal): use ediff-vc-revision-other-window.
-        (ediff-vc-merge-internal): use ediff-vc-revision-other-window and
-        ediff-vc-working-revision.
-        Require vc-hooks.
-        
 2007-11-01  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * configure.in: Remove HAVE_X11R5 check.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42201dd0af8..28630124723 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -19,12 +19,11 @@
         (ediff-reset-diff-options): Remove to simplify the mandatory option
         handling on Windows.
         (ediff-set-diff-options): Add.
-        (ediff-diff-options): Changed.
+        (ediff-diff-options): Set "--binary" option as default in some cases.
 
         * ediff-vers.el (ediff-vc-internal): Use ediff-vc-revision-other-window.
-        (ediff-vc-merge-internal): use ediff-vc-revision-other-window and
-        ediff-vc-working-revision.
-        Require vc-hooks.
+        (ediff-vc-merge-internal): Use ediff-vc-revision-other-window and
+        ediff-vc-working-revision.  Require vc-hooks.
 
 2007-11-02  Drake Wilson  <drake@begriffli.ch>  (tiny change)