[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 28d28b7 116/258: Add restore windows command
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 28d28b7 116/258: Add restore windows command |
Date: |
Wed, 17 May 2017 08:13:34 -0400 (EDT) |
branch: scratch/add-vdiff
commit 28d28b756955616f088812d9733677c3fa49572d
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Add restore windows command
---
vdiff.el | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/vdiff.el b/vdiff.el
index 6e39c90..41897a5 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -182,6 +182,7 @@ because those are handled differently.")
(defvar vdiff--diff-stale nil)
(defvar vdiff--after-change-timer nil)
(defvar vdiff--after-change-refresh-delay 1)
+(defvar vdiff--window-configuration nil)
;; * Utilities
@@ -966,6 +967,11 @@ buffer and center both buffers at this line."
(vdiff--sync-line (line-number-at-pos) (vdiff--buffer-a-p))
(vdiff--recenter-both))
+(defun vdiff-restore-windows ()
+ "Restore initial window configuration."
+ (interactive)
+ (set-window-configuration vdiff--window-configuration))
+
(defun vdiff--pos-at-line-beginning (line &optional buffer)
"Return position at beginning of LINE in BUFFER (or current
buffer)."
@@ -1305,7 +1311,9 @@ commands like `vdiff-files' or `vdiff-buffers'."
(add-hook 'after-change-functions
'vdiff--after-change-function nil t)
(when vdiff-lock-scrolling
- (vdiff-scroll-lock-mode 1)))
+ (vdiff-scroll-lock-mode 1))
+ (setq vdiff--window-configuration
+ (current-window-configuration)))
(t
(vdiff--remove-all-overlays)
(setq cursor-in-non-selected-windows t)
@@ -1320,6 +1328,7 @@ commands like `vdiff-files' or `vdiff-buffers'."
(setq vdiff--buffers nil)
(setq vdiff--a-b-line-map nil)
(setq vdiff--b-a-line-map nil)
+ (setq vdiff--window-configuration nil)
(dolist (file vdiff--temp-files)
(delete-file file))
(setq vdiff--temp-files nil)
- [elpa] scratch/add-vdiff 528a5ce 051/258: Simplify logic for sending/receiving changes, (continued)
- [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
- [elpa] scratch/add-vdiff e94d187 059/258: Simplify adding overlays, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4596948 081/258: Reduce load in vdiff--scroll-function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d65fcd7 083/258: Simplify commentary, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0777eda 099/258: Add vdiff-refresh binding to prefix map, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff d46f686 094/258: Make README table narrower, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 803fd6d 098/258: Add subtraction style option, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5f2c72c 105/258: Change alignment algorithm, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f481a82 112/258: Add refresh timer delay, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 28d28b7 116/258: Add restore windows command,
Justin Burkett <=
- [elpa] scratch/add-vdiff 905be9c 122/258: Map remove refinements command, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 717d5b6 121/258: Allow failed line translation, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b267885 137/258: Merge branch 'gvol-master', Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8daa391 133/258: Add case and whitespace toggles, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 95a1230 154/258: Fix vscroll bug, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff e556705 151/258: Simplify scroll function, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f36b6b2 162/258: Fix line-translation error, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 13f553f 163/258: Fix fold logic for diff3, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 88e7f1c 178/258: Remove min-window-width, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 679617c 199/258: Force update of window-start on manual scroll-function, Justin Burkett, 2017/05/17