emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] scratch/add-vdiff 7a3e456 234/258: vdiff-magit: Cleanup after sta


From: Justin Burkett
Subject: [elpa] scratch/add-vdiff 7a3e456 234/258: vdiff-magit: Cleanup after stage
Date: Wed, 17 May 2017 08:13:59 -0400 (EDT)

branch: scratch/add-vdiff
commit 7a3e4561cbbee319b100ddafe7a0f649a50f7298
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    vdiff-magit: Cleanup after stage
---
 vdiff-magit.el | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/vdiff-magit.el b/vdiff-magit.el
index a9d27fb..fc1f91b 100644
--- a/vdiff-magit.el
+++ b/vdiff-magit.el
@@ -226,9 +226,6 @@ 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
@@ -242,7 +239,9 @@ FILE has to be relative to the top directory of the 
repository."
                (save-buffer))))
          (when (y-or-n-p
                 (format "Kill buffer %s?" (buffer-file-name buf-c)))
-           (kill-buffer buf-c)))
+           (kill-buffer buf-c))
+         (when (buffer-live-p buf-a)
+           (kill-buffer buf-a)))
        t nil))))
 
 ;; ;;;###autoload



reply via email to

[Prev in Thread] Current Thread [Next in Thread]