diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2020-05-16 15:34:47 +0200 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2020-05-16 15:41:29 +0200 |
| commit | 21b7165473d68f47e16cb491ea410a10b2d65b71 (patch) | |
| tree | 041da2ec7182d1a8526ce617e702ab5b726c37d6 | |
| parent | 436809b705aaf10776af4615a9691406408735eb (diff) | |
| download | emacs-21b7165473d68f47e16cb491ea410a10b2d65b71.tar.gz | |
Remove Emacs 22 compat code from ediff-vers.el
* lisp/vc/ediff-vers.el (ediff-vc-revision-other-window)
(ediff-vc-working-revision): Redefine Emacs 22 compatibility
aliases as obsolete function aliases.
(ediff-vc-internal, ediff-vc-merge-internal): Don't use the now
obsolete aliases.
| -rw-r--r-- | lisp/vc/ediff-vers.el | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/lisp/vc/ediff-vers.el b/lisp/vc/ediff-vers.el index a95606fad5e..4ee7ee5c1f5 100644 --- a/lisp/vc/ediff-vers.el +++ b/lisp/vc/ediff-vers.el @@ -49,15 +49,10 @@ 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)) +(define-obsolete-function-alias 'ediff-vc-revision-other-window + #'vc-revision-other-window "28.1") +(define-obsolete-function-alias 'ediff-vc-working-revision + #'vc-working-revision "28.1") ;; VC.el support @@ -88,12 +83,12 @@ comparison or merge operations are being performed." (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) (save-window-excursion (save-excursion - (ediff-vc-revision-other-window rev1) + (vc-revision-other-window rev1) (setq rev1buf (current-buffer) file1 (buffer-file-name))) (save-excursion (or (string= rev2 "") ; use current buffer - (ediff-vc-revision-other-window rev2)) + (vc-revision-other-window rev2)) (setq rev2buf (current-buffer) file2 (buffer-file-name))) (push (lambda () @@ -165,18 +160,18 @@ comparison or merge operations are being performed." (let (buf1 buf2 ancestor-buf) (save-window-excursion (save-excursion - (ediff-vc-revision-other-window rev1) + (vc-revision-other-window rev1) (setq buf1 (current-buffer))) (save-excursion (or (string= rev2 "") - (ediff-vc-revision-other-window rev2)) + (vc-revision-other-window rev2)) (setq buf2 (current-buffer))) (if ancestor-rev (save-excursion (if (string= ancestor-rev "") - (setq ancestor-rev (ediff-vc-working-revision + (setq ancestor-rev (vc-working-revision buffer-file-name))) - (ediff-vc-revision-other-window ancestor-rev) + (vc-revision-other-window ancestor-rev) (setq ancestor-buf (current-buffer)))) (push (let ((f1 (buffer-file-name buf1)) (f2 (unless (string= rev2 "") (buffer-file-name buf2))) |