[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 05cbdee 227/258: vdiff: Allow buffers to be kil
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 05cbdee 227/258: vdiff: Allow buffers to be killed in quit |
Date: |
Wed, 17 May 2017 08:13:58 -0400 (EDT) |
branch: scratch/add-vdiff
commit 05cbdee33ee0b5ed7afe2aa81d624043dd2f2a88
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff: Allow buffers to be killed in quit
---
vdiff.el | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 72a931c..ccc3bb3 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1774,12 +1774,13 @@ you will be asked to select two files."
(kill-process (get-buffer-process buf)))
(when (buffer-live-p buf) (kill-buffer buf)))
(dolist (buf (vdiff-session-buffers ses))
- (with-current-buffer buf
- (if vdiff-3way-mode
- (vdiff-3way-mode -1)
- (vdiff-mode -1)))
- (when (vdiff-session-kill-buffers-on-quit ses)
- (kill-buffer buf)))
+ (when (buffer-live-p buf)
+ (with-current-buffer buf
+ (if vdiff-3way-mode
+ (vdiff-3way-mode -1)
+ (vdiff-mode -1)))
+ (when (vdiff-session-kill-buffers-on-quit ses)
+ (kill-buffer buf))))
;; (run-hooks 'vdiff-quit-hook)
(when (vdiff-session-prior-window-config ses)
(set-window-configuration
- [elpa] scratch/add-vdiff 8c78e58 170/258: Fix compiler warning, (continued)
- [elpa] scratch/add-vdiff 8c78e58 170/258: Fix compiler warning, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 9890b81 181/258: Fix weird vscroll problem, Justin Burkett, 2017/05/17
- [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 <=
- [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, 2017/05/17
- [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