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

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

[elpa] scratch/add-vdiff 1d8f6e7 185/258: Use correct mode for three way


From: Justin Burkett
Subject: [elpa] scratch/add-vdiff 1d8f6e7 185/258: Use correct mode for three way diff on quit
Date: Wed, 17 May 2017 08:13:47 -0400 (EDT)

branch: scratch/add-vdiff
commit 1d8f6e779e8e51ddb81208d5392653f151040653
Author: justbur <address@hidden>
Commit: justbur <address@hidden>

    Use correct mode for three way diff on quit
---
 vdiff.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/vdiff.el b/vdiff.el
index 1d8ddb6..40e3133 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1682,7 +1682,9 @@ you will be asked to select two files."
              (vdiff-session-buffers vdiff--session)))
     (dolist (buf (vdiff-session-buffers vdiff--session))
       (with-current-buffer buf
-        (vdiff-mode -1)))
+        (if vdiff-3way-mode
+            (vdiff-3way-mode -1)
+          (vdiff-mode -1))))
     (run-hooks 'vdiff-quit-hook)
     (message "vdiff exited")))
 



reply via email to

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