diff options
| author | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-10-10 18:52:45 +0000 |
|---|---|---|
| committer | Eric S. Raymond <esr@snark.thyrsus.com> | 2007-10-10 18:52:45 +0000 |
| commit | ac3f4c6f0213219ce488c46667a8bed6f915e71f (patch) | |
| tree | f9c3f270572da2ccd0cb9ce9786f56df0ee1ccef /lisp/ediff-vers.el | |
| parent | ed4e8e8a4b9eeb73a54e686dc2264c635d2416e3 (diff) | |
| download | emacs-ac3f4c6f0213219ce488c46667a8bed6f915e71f.tar.gz emacs-ac3f4c6f0213219ce488c46667a8bed6f915e71f.tar.bz2 emacs-ac3f4c6f0213219ce488c46667a8bed6f915e71f.zip | |
Terminology cleanup.
Diffstat (limited to 'lisp/ediff-vers.el')
| -rw-r--r-- | lisp/ediff-vers.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index d0a323980c2..97232afce76 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el @@ -200,7 +200,7 @@ comparison or merge operations are being performed." (if ancestor-rev (save-excursion (if (string= ancestor-rev "") - (setq ancestor-rev (vc-workfile-version buffer-file-name))) + (setq ancestor-rev (vc-working-revision buffer-file-name))) (vc-version-other-window ancestor-rev) (setq ancestor-buf (current-buffer)))) (setq startup-hooks |