[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")))
- [elpa] scratch/add-vdiff 83f0788 118/258: Don't make temp files global, (continued)
- [elpa] scratch/add-vdiff 83f0788 118/258: Don't make temp files global, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 72fe0fa 130/258: Don't update diff info while sending changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c6e30a2 136/258: Merge pull request #9 from gvol/master, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 53c2a6b 153/258: Fix receiving changes, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5dcdc97 158/258: Remove other-window, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7029054 159/258: Comment out vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 97d7098 174/258: Add screenshot of three way diff, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8b79246 171/258: Make sure we're in a vdiff buffer on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 42f56ae 177/258: Don't jump to beginning of buffer on start, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 192dbfe 166/258: Release vdiff-buffers3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1d8f6e7 185/258: Use correct mode for three way diff on quit,
Justin Burkett <=
- [elpa] scratch/add-vdiff 71d1d20 169/258: Add overlay markers to diff3 send/receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fef3208 189/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 03e1b64 186/258: Remove unnecessary unique name function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 87ade86 192/258: Always move to start of fold on close, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d3faef0 197/258: Refresh manually after receive, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a88d313 200/258: Sync scroll after fold toggle, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 74feddf 206/258: Adjust width of subtraction string, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9d89a66 211/258: Add melpa badge, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b705857 006/258: Remove window-starts variable, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff aadf726 011/258: Add TODO item, Justin Burkett, 2017/05/17