[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff e5d3633 226/258: Revert "vdiff-magit: Simplify
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff e5d3633 226/258: Revert "vdiff-magit: Simplify stage" |
Date: |
Wed, 17 May 2017 08:13:58 -0400 (EDT) |
branch: scratch/add-vdiff
commit e5d36332e0d24090fd5a520dad6032f56896913b
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
Revert "vdiff-magit: Simplify stage"
This reverts commit 219d7651d105c86ad928f7c94a7f83457766a232.
---
vdiff-magit.el | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/vdiff-magit.el b/vdiff-magit.el
index 5943a9a..b1ad04f 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -226,16 +226,21 @@ FILE has to be relative to the top directory of the
repository."
(current-buffer))
fileBufC
(lambda (buf-a buf-b buf-c)
+ (when (and (buffer-live-p buf-a)
+ (buffer-modified-p buf-a))
+ (kill-buffer buf-a))
(when (and (buffer-live-p buf-b)
(buffer-modified-p buf-b))
(with-current-buffer buf-b
- (magit-update-index)))
+ (magit-update-index))
+ (kill-buffer buf-b))
(when (and (buffer-live-p buf-c)
(buffer-modified-p buf-c))
(with-current-buffer buf-c
(when (y-or-n-p
(format "Save file %s? " buffer-file-name))
- (save-buffer)))))
+ (save-buffer)))
+ (kill-buffer buf-c)))
t t))))
;; ;;;###autoload
- [elpa] scratch/add-vdiff 9454053 187/258: Use window-text-width instead of window-width, (continued)
- [elpa] scratch/add-vdiff 9454053 187/258: Use window-text-width instead of window-width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e6e834f 196/258: Don't refresh on buffer switch, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5043ca3 168/258: Wrap global state into session object, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff af5ddce 203/258: Remove vdiff-sync-and-center, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7f100a3 210/258: Fix vdiff-refresh callback function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1478a02 219/258: vdiff-magit: Make group, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 90374e7 223/258: vdiff-magit: Port dwim-show-on-hunks, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 219d765 225/258: vdiff-magit: Simplify stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 05cbdee 227/258: vdiff: Allow buffers to be killed in quit, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 98e1add 216/258: vdiff-magit: Port show-staged, show-unstaged and stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e5d3633 226/258: Revert "vdiff-magit: Simplify stage",
Justin Burkett <=
- [elpa] scratch/add-vdiff de84cfd 232/258: vdiff-magit: Fix a function reference in dwim, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7a3e456 234/258: vdiff-magit: Cleanup after stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 52d49ba 214/258: Merge branch 'magit' into magit2, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ff1fbc4 248/258: vdiff: Generate ancestor buffer in merge-conflict, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d243767 253/258: README: Add entry points and vimdiff bindings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 79b3434 052/258: Make some arg names more consistent, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 528a5ce 051/258: Simplify logic for sending/receiving changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2f1ad9 068/258: Add vdiff-hydra.el, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e94d187 059/258: Simplify adding overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4596948 081/258: Reduce load in vdiff--scroll-function, Justin Burkett, 2017/05/17