diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/ediff-vers.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 17e6ba20f54..39c9bd236f1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-02 Michael Kifer <kifer@cs.stonybrook.edu> | ||
| 2 | |||
| 3 | * ediff-vers (ediff-vc-working-revision): add a quote. | ||
| 4 | |||
| 1 | 2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change) | 5 | 2007-11-02 Drake Wilson <drake@begriffli.ch> (tiny change) |
| 2 | 6 | ||
| 3 | * files.el (hack-local-variables): Fix membership tests to avoid | 7 | * files.el (hack-local-variables): Fix membership tests to avoid |
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el index 8ce2bcb2021..293acc5a854 100644 --- a/lisp/ediff-vers.el +++ b/lisp/ediff-vers.el | |||
| @@ -60,7 +60,7 @@ comparison or merge operations are being performed." | |||
| 60 | (defalias 'ediff-vc-working-revision | 60 | (defalias 'ediff-vc-working-revision |
| 61 | (if (fboundp 'vc-working-revision) | 61 | (if (fboundp 'vc-working-revision) |
| 62 | 'vc-working-revision | 62 | 'vc-working-revision |
| 63 | vc-workfile-version)) | 63 | 'vc-workfile-version)) |
| 64 | 64 | ||
| 65 | ;; VC.el support | 65 | ;; VC.el support |
| 66 | 66 | ||