[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff f11c7c2 257/258: vdiff: Fix vdiff-buffers windo
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff f11c7c2 257/258: vdiff: Fix vdiff-buffers window layout |
Date: |
Wed, 17 May 2017 08:14:03 -0400 (EDT) |
branch: scratch/add-vdiff
commit f11c7c2eeef33a0b75fe4e025818e7e672c57397
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
vdiff: Fix vdiff-buffers window layout
When split-width-threshold is too small the window was getting split twice
with
the call to switch-to-buffer-other-window. The new method ensures that the
split
only happens once.
See #15
---
vdiff.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 6a7fc11..b2c5e91 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -1671,11 +1671,11 @@ function for ON-QUIT to do something useful with the
result."
(buffer-b (get-buffer buffer-b)))
(delete-other-windows)
(switch-to-buffer buffer-a)
- (save-selected-window
- (if horizontal
- (split-window-vertically)
- (split-window-horizontally))
- (switch-to-buffer-other-window buffer-b))
+ (set-window-buffer
+ (if horizontal
+ (split-window-vertically)
+ (split-window-horizontally))
+ buffer-b)
(setq vdiff--temp-session
(vdiff--init-session
buffer-a buffer-b nil
- [elpa] scratch/add-vdiff a040a4b 246/258: vdiff: Add vdiff-merge-conflict, (continued)
- [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, 2017/05/17
- [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 <=