aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2007-11-02 15:51:35 +0000
committerJuanma Barranquero2007-11-02 15:51:35 +0000
commitd779c51027ba8d89d79993e7566e4e522f535407 (patch)
tree02447648d65d1c74d0c94db5a2a2fc8a74815b4f
parent8ef97aecad0e1d63c8e95b44b04ddc5371fa3a9d (diff)
downloademacs-d779c51027ba8d89d79993e7566e4e522f535407.tar.gz
emacs-d779c51027ba8d89d79993e7566e4e522f535407.zip
*** empty log message ***
-rw-r--r--lisp/ChangeLog30
1 files changed, 27 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39c9bd236f1..42201dd0af8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,31 @@
12007-11-02 Michael Kifer <kifer@cs.stonybrook.edu> 12007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
2 2
3 * ediff-vers (ediff-vc-working-revision): add a quote. 3 * ediff-vers.el (ediff-vc-working-revision): Add a quote.
4 4
52007-11-02 Michael Kifer <kifer@cs.stonybrook.edu>
6
7 * emulation/viper-ex.el (viper-ex): Do not ignore the region.
8
9 * emulation/viper-cmd.el (viper-prev-destructive-command)
10 (viper-insert-prev-from-insertion-ring): Use ring-copy instead of
11 copy-sequence.
12
13 * ediff-util.el (ediff-make-current-diff-overlay): Do not use face-name.
14 Got rid of ediff-copy-list.
15
16 * ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer): Do not
17 use face-name.
18 (ediff-test-utility,ediff-diff-mandatory-option)
19 (ediff-reset-diff-options): Remove to simplify the mandatory option
20 handling on Windows.
21 (ediff-set-diff-options): Add.
22 (ediff-diff-options): Changed.
23
24 * ediff-vers.el (ediff-vc-internal): Use ediff-vc-revision-other-window.
25 (ediff-vc-merge-internal): use ediff-vc-revision-other-window and
26 ediff-vc-working-revision.
27 Require vc-hooks.
28
52007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change) 292007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change)
6 30
7 * files.el (hack-local-variables): Fix membership tests to avoid 31 * files.el (hack-local-variables): Fix membership tests to avoid