aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorMichael Kifer <[email protected]>2007-11-02 15:24:29 +0000
committerMichael Kifer <[email protected]>2007-11-02 15:24:29 +0000
commit8ef97aecad0e1d63c8e95b44b04ddc5371fa3a9d (patch)
tree065bba2d333b5f202c89ff24267b6c8cda66d38d /lisp
parent3020ee9278142603cb65e04f75cdcf363637860d (diff)
2007-11-02 Michael Kifer <[email protected]>
* ediff-vers (ediff-vc-working-revision): add a quote.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ediff-vers.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17e6ba20f5..39c9bd236f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-02 Michael Kifer <[email protected]>
+
+ * ediff-vers (ediff-vc-working-revision): add a quote.
+
2007-11-02 Drake Wilson <[email protected]> (tiny change)
* files.el (hack-local-variables): Fix membership tests to avoid
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 8ce2bcb202..293acc5a85 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -60,7 +60,7 @@ comparison or merge operations are being performed."
(defalias 'ediff-vc-working-revision
(if (fboundp 'vc-working-revision)
'vc-working-revision
- vc-workfile-version))
+ 'vc-workfile-version))
;; VC.el support