Mercurial > emacs
comparison lisp/ediff-vers.el @ 85139:8ba0e30716a5
Terminology cleanup.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Wed, 10 Oct 2007 18:52:45 +0000 |
parents | 9355f9b7bbff |
children | 708abc311fa6 |
comparison
equal
deleted
inserted
replaced
85138:9eb84ff59d9b | 85139:8ba0e30716a5 |
---|---|
198 (vc-version-other-window rev2)) | 198 (vc-version-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-workfile-version buffer-file-name))) | 203 (setq ancestor-rev (vc-working-revision buffer-file-name))) |
204 (vc-version-other-window ancestor-rev) | 204 (vc-version-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 () |