[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v
From: |
Eric S. Raymond |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v |
Date: |
Wed, 10 Oct 2007 18:52:47 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Eric S. Raymond <esr> 07/10/10 18:52:45
Index: lisp/ediff-vers.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/ediff-vers.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- lisp/ediff-vers.el 26 Jul 2007 05:26:22 -0000 1.29
+++ lisp/ediff-vers.el 10 Oct 2007 18:52:44 -0000 1.30
@@ -200,7 +200,7 @@
(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
- [Emacs-diffs] Changes to emacs/lisp/ediff-vers.el,v,
Eric S. Raymond <=