[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff fb3097c 247/258: vdiff: Check if window exists
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff fb3097c 247/258: vdiff: Check if window exists before forcing vscroll |
Date: |
Wed, 17 May 2017 08:14:02 -0400 (EDT) |
branch: scratch/add-vdiff
commit fb3097cf38424ccd02457327f3882d01ed320775
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff: Check if window exists before forcing vscroll
---
vdiff.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 1f7ed04..bc9234a 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1357,10 +1357,12 @@ buffer)."
(lambda ()
(unless vdiff--setting-vscroll
(let ((vdiff--setting-vscroll t))
- (when (and vscroll
- (eq vdiff-subtraction-style 'full))
- (set-window-vscroll window vscroll))
- (force-window-update window))))))
+ (when (and (windowp window)
+ (window-live-p window))
+ (when (and vscroll
+ (eq vdiff-subtraction-style 'full))
+ (set-window-vscroll window vscroll))
+ (force-window-update window)))))))
(defun vdiff--flag-new-command ()
(setq vdiff--new-command t))
- [elpa] scratch/add-vdiff 7d60015 201/258: Add some doctrings, (continued)
- [elpa] scratch/add-vdiff 7d60015 201/258: Add some doctrings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3037be6 222/258: vdiff-magit: Cleanup references in dwim, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 615e7bd 228/258: vdiff-magit: Fix killing of buffers in stage, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a040a4b 246/258: vdiff: Add vdiff-merge-conflict, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 7fbb20e 205/258: Nil temp-session after using it, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 048d544 198/258: Pass session explicitly from refresh sentinel, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff ed25084 224/258: vdiff-magit: Fix some strings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 432534d 230/258: vdiff-magit: Don't use vdiff-magit-resolve yet, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1d79425 235/258: vdiff-magit: Cleanup header, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff c2c991d 209/258: Add initial vdiff-magit work, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff fb3097c 247/258: vdiff: Check if window exists before forcing vscroll,
Justin Burkett <=
- [elpa] scratch/add-vdiff bcacd3f 249/258: vdiff: Add option vdiff-use-ancestor-as-merge-buffer, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 52ea351 237/258: vdiff-magit: Add option to prefer ediff for merges, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f11c7c2 257/258: vdiff: Fix vdiff-buffers window layout, Justin Burkett, 2017/05/17