Mercurial > emacs
comparison lisp/ediff-vers.el @ 85169:708abc311fa6
Follow through on the VC terminology change (version -> revision).
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Thu, 11 Oct 2007 16:02:53 +0000 |
| parents | 8ba0e30716a5 |
| children | 13163bbed0bf d38543a1c0f9 |
comparison
equal
deleted
inserted
replaced
| 85168:0860e426be99 | 85169:708abc311fa6 |
|---|---|
| 82 (let (file1 file2 rev1buf rev2buf) | 82 (let (file1 file2 rev1buf rev2buf) |
| 83 (if (string= rev1 "") | 83 (if (string= rev1 "") |
| 84 (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) | 84 (setq rev1 (ediff-vc-latest-version (buffer-file-name)))) |
| 85 (save-window-excursion | 85 (save-window-excursion |
| 86 (save-excursion | 86 (save-excursion |
| 87 (vc-version-other-window rev1) | 87 (vc-revision-other-window rev1) |
| 88 (setq rev1buf (current-buffer) | 88 (setq rev1buf (current-buffer) |
| 89 file1 (buffer-file-name))) | 89 file1 (buffer-file-name))) |
| 90 (save-excursion | 90 (save-excursion |
| 91 (or (string= rev2 "") ; use current buffer | 91 (or (string= rev2 "") ; use current buffer |
| 92 (vc-version-other-window rev2)) | 92 (vc-revision-other-window rev2)) |
| 93 (setq rev2buf (current-buffer) | 93 (setq rev2buf (current-buffer) |
| 94 file2 (buffer-file-name))) | 94 file2 (buffer-file-name))) |
| 95 (setq startup-hooks | 95 (setq startup-hooks |
| 96 (cons `(lambda () | 96 (cons `(lambda () |
| 97 (ediff-delete-version-file ,file1) | 97 (ediff-delete-version-file ,file1) |
| 189 &optional startup-hooks merge-buffer-file) | 189 &optional startup-hooks merge-buffer-file) |
| 190 ;; If ANCESTOR-REV non-nil, merge with ancestor | 190 ;; If ANCESTOR-REV non-nil, merge with ancestor |
| 191 (let (buf1 buf2 ancestor-buf) | 191 (let (buf1 buf2 ancestor-buf) |
| 192 (save-window-excursion | 192 (save-window-excursion |
| 193 (save-excursion | 193 (save-excursion |
| 194 (vc-version-other-window rev1) | 194 (vc-revision-other-window rev1) |
| 195 (setq buf1 (current-buffer))) | 195 (setq buf1 (current-buffer))) |
| 196 (save-excursion | 196 (save-excursion |
| 197 (or (string= rev2 "") | 197 (or (string= rev2 "") |
| 198 (vc-version-other-window rev2)) | 198 (vc-revision-other-window rev2)) |
| 199 (setq buf2 (current-buffer))) | 199 (setq buf2 (current-buffer))) |
| 200 (if ancestor-rev | 200 (if ancestor-rev |
| 201 (save-excursion | 201 (save-excursion |
| 202 (if (string= ancestor-rev "") | 202 (if (string= ancestor-rev "") |
| 203 (setq ancestor-rev (vc-working-revision buffer-file-name))) | 203 (setq ancestor-rev (vc-working-revision buffer-file-name))) |
| 204 (vc-version-other-window ancestor-rev) | 204 (vc-revision-other-window ancestor-rev) |
| 205 (setq ancestor-buf (current-buffer)))) | 205 (setq ancestor-buf (current-buffer)))) |
| 206 (setq startup-hooks | 206 (setq startup-hooks |
| 207 (cons | 207 (cons |
| 208 `(lambda () | 208 `(lambda () |
| 209 (ediff-delete-version-file ,(buffer-file-name buf1)) | 209 (ediff-delete-version-file ,(buffer-file-name buf1)) |