[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 1155601 014/258: Fix problem with restarting mo
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 1155601 014/258: Fix problem with restarting mode and temp files |
Date: |
Wed, 17 May 2017 08:13:12 -0400 (EDT) |
branch: scratch/add-vdiff
commit 115560110a236ef7e8683e62c778db958984209f
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
Fix problem with restarting mode and temp files
---
vdiff.el | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 0346525..32a4577 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -132,8 +132,7 @@ the buffer here, because those are handled differently."
:type '(repeat symbol))
(defvar vdiff--buffers nil)
-(defvar vdiff--temp-files (list (make-temp-file "vdiff--temp-a-")
- (make-temp-file "vdiff--temp-b-")))
+(defvar vdiff--temp-files nil)
(defvar vdiff--process-buffer " *vdiff*")
(defvar vdiff--diff-data nil)
(defvar vdiff--diff-code-regexp
@@ -656,8 +655,9 @@ asked to select two files."
(split-window-horizontally)))
(find-file-other-window file-b)
(setq vdiff--buffers (list buffer-a (window-buffer window-b)))
- (vdiff-mode 1)
- (vdiff-refresh))))
+ (vdiff-mode 1))
+ (vdiff-mode 1)
+ (vdiff-refresh)))
;;;###autoload
(defun vdiff-buffers (buffer-a buffer-b &optional horizontal)
@@ -711,6 +711,9 @@ changes. This will be enabled automatically after calling
commands like `vdiff-files' or `vdiff-buffers'."
nil " vdiff" 'vdiff-mode-map
(cond (vdiff-mode
+ (setq vdiff--temp-files
+ (list (make-temp-file "vdiff--temp-a-")
+ (make-temp-file "vdiff--temp-b-")))
(setq cursor-in-non-selected-windows nil)
(add-hook 'after-save-hook #'vdiff-refresh nil t)
(when vdiff-lock-scrolling
- [elpa] branch scratch/add-vdiff created (now 819ea4b), Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b6b37a5 022/258: Broaden search for overlays at point, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4b7f3d1 004/258: Make buffer names easier to read in functions, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 1155601 014/258: Fix problem with restarting mode and temp files,
Justin Burkett <=
- [elpa] scratch/add-vdiff 1b96390 021/258: Use fringes for open folds, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 8a51468 025/258: Don't close fold on point on refresh, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 4d5299e 031/258: Fix alignment of folds next to subtractions, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff f826315 033/258: Increase default fold padding, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3e1169c 043/258: Screenshot showing off theme integration, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a094450 048/258: Tweak line translation rules for better scrolling, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 0fd1837 063/258: Update screenshot, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b02b59e 072/258: Whitespace cleanup, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff b2ba7ab 070/258: Move hydra to main file and avoid dependency, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff bfdfc74 053/258: Modify gitignore, Justin Burkett, 2017/05/17