From: Juanma Barranquero Date: Fri, 2 Nov 2007 15:51:35 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: emacs-pretest-23.0.90~9883 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d779c51027ba8d89d79993e7566e4e522f535407;p=emacs.git *** empty log message *** --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 39c9bd236f1..42201dd0af8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,31 @@ 2007-11-02 Michael Kifer - - * ediff-vers (ediff-vc-working-revision): add a quote. - + + * ediff-vers.el (ediff-vc-working-revision): Add a quote. + +2007-11-02 Michael Kifer + + * emulation/viper-ex.el (viper-ex): Do not ignore the region. + + * emulation/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): Remove to simplify the mandatory option + handling on Windows. + (ediff-set-diff-options): Add. + (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-02 Drake Wilson (tiny change) * files.el (hack-local-variables): Fix membership tests to avoid