* vc/vc.el (vc-diff-build-argument-list-internal): If the file is

not locked, use last revision and current source as
defaults.  (Bug#15569)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8f9450f0db8d16e0445bbe020727052833ed539b..bb675ce5088a170310d1d6d14dedf87c947b8a5a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-10  João Távora <joaotavora@gmail.com>
+
+       * vc/vc.el (vc-diff-build-argument-list-internal): If the file is
+       not locked, use last revision and current source as
+       defaults.  (Bug#15569)
+
 2013-10-10  Masatake YAMATO  <yamato@redhat.com>
 
        * menu-bar.el (menu-bar-open): Don't use popup-menu if

diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 13f0d836f910914b3903afa95a3d3780a0632fe7..585b6d48d45f627123b580c219879a88fc8ed0a8 100644 (file)
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1739,13 +1739,12 @@ Return t if the buffer had changes, nil otherwise."
      ;; if the file is not up-to-date, use working revision as older revision
      ((not (vc-up-to-date-p first))
       (setq rev1-default (vc-working-revision first)))
-     ;; if the file is not locked, use last and previous revisions as defaults
+     ;; if the file is not locked, use last revision and current source as defaults
      (t
       (setq rev1-default (ignore-errors ;If `previous-revision' doesn't work.
                            (vc-call-backend backend 'previous-revision first
                                             (vc-working-revision first))))
-      (when (string= rev1-default "") (setq rev1-default nil))
-      (setq rev2-default (vc-working-revision first))))
+      (when (string= rev1-default "") (setq rev1-default nil))))
     ;; construct argument list
     (let* ((rev1-prompt (if rev1-default
                             (concat "Older revision (default "