diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-11-02 06:03:12 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2007-11-02 06:03:12 +0000 |
| commit | 33468a59c6b42e489bc8ae147c43818d8b76a2a7 (patch) | |
| tree | 22f2abf83551c006bcc231dcb890e1dac202f48c /lisp/ediff-vers.el | |
| parent | 246a4316dea32514edf84e9e2552627327149160 (diff) | |
| download | emacs-33468a59c6b42e489bc8ae147c43818d8b76a2a7.tar.gz | |
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.
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 98c1defc212..8ce2bcb2021 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -52,8 +52,22 @@ comparison or merge operations are being performed." :group 'ediff-vers ) +(defalias 'ediff-vc-revision-other-window + (if (fboundp 'vc-revision-other-window) + 'vc-revision-other-window + 'vc-version-other-window)) + +(defalias 'ediff-vc-working-revision + (if (fboundp 'vc-working-revision) + 'vc-working-revision + vc-workfile-version)) + ;; VC.el support +(eval-when-compile + (require 'vc-hooks)) ;; for vc-call macro + + (defun ediff-vc-latest-version (file) "Return the version level of the latest version of FILE in repository." (if (fboundp 'vc-latest-version) @@ -77,12 +91,12 @@ comparison or merge operations are being performed." (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) (save-window-excursion (save-excursion - (vc-revision-other-window rev1) + (ediff-vc-revision-other-window rev1) (setq rev1buf (current-buffer) file1 (buffer-file-name))) (save-excursion (or (string= rev2 "") ; use current buffer - (vc-revision-other-window rev2)) + (ediff-vc-revision-other-window rev2)) (setq rev2buf (current-buffer) file2 (buffer-file-name))) (setq startup-hooks @@ -158,17 +172,17 @@ comparison or merge operations are being performed." (let (buf1 buf2 ancestor-buf) (save-window-excursion (save-excursion - (vc-revision-other-window rev1) + (ediff-vc-revision-other-window rev1) (setq buf1 (current-buffer))) (save-excursion (or (string= rev2 "") - (vc-revision-other-window rev2)) + (ediff-vc-revision-other-window rev2)) (setq buf2 (current-buffer))) (if ancestor-rev (save-excursion (if (string= ancestor-rev "") - (setq ancestor-rev (vc-working-revision buffer-file-name))) - (vc-revision-other-window ancestor-rev) + (setq ancestor-rev (ediff-vc-working-revision buffer-file-name))) + (ediff-vc-revision-other-window ancestor-rev) (setq ancestor-buf (current-buffer)))) (setq startup-hooks (cons |