[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114612: * vc/vc.el (vc-diff-build-argument-list-int
From: |
Alp Aker |
Subject: |
[Emacs-diffs] trunk r114612: * vc/vc.el (vc-diff-build-argument-list-internal): If the file is |
Date: |
Thu, 10 Oct 2013 14:59:47 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114612
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15569
author: João Távora <address@hidden>
committer: Alp Aker <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-10 10:59:09 -0400
message:
* 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)
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/vc/vc.el vc.el-20091113204419-o5vbwnq5f7feedwu-502
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-10 10:47:11 +0000
+++ b/lisp/ChangeLog 2013-10-10 14:59:09 +0000
@@ -1,3 +1,9 @@
+2013-10-10 João Távora <address@hidden>
+
+ * 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 <address@hidden>
* menu-bar.el (menu-bar-open): Don't use popup-menu if
=== modified file 'lisp/vc/vc.el'
--- a/lisp/vc/vc.el 2013-10-04 23:47:00 +0000
+++ b/lisp/vc/vc.el 2013-10-10 14:59:09 +0000
@@ -1739,13 +1739,12 @@
;; 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 "
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114612: * vc/vc.el (vc-diff-build-argument-list-internal): If the file is,
Alp Aker <=