diff options
| author | João Távora <joaotavora@gmail.com> | 2013-10-10 10:59:09 -0400 |
|---|---|---|
| committer | Alp Aker <alp.tekin.aker@gmail.com> | 2013-10-10 10:59:09 -0400 |
| commit | db1386987b5c2ccbfa28d4638b822afc5a8eedbb (patch) | |
| tree | 3c88b733298bc1760edf3efe24cfeed881e8bee2 | |
| parent | 2f6e161e3e7d2b6dd6f3b96dc69207e607b11181 (diff) | |
| download | emacs-db1386987b5c2ccbfa28d4638b822afc5a8eedbb.tar.gz | |
* 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)
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f9450f0db8..bb675ce5088 100644 --- 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 13f0d836f91..585b6d48d45 100644 --- 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 " |