[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/add-vdiff 7f100a3 210/258: Fix vdiff-refresh callback fun
From: |
Justin Burkett |
Subject: |
[elpa] scratch/add-vdiff 7f100a3 210/258: Fix vdiff-refresh callback function |
Date: |
Wed, 17 May 2017 08:13:53 -0400 (EDT) |
branch: scratch/add-vdiff
commit 7f100a3a0de73215cc8fc229c6a4b57b3481825c
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>
Fix vdiff-refresh callback function
Used run-hooks on a single function.
---
vdiff.el | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/vdiff.el b/vdiff.el
index 0d93134..89a8964 100644
--- a/vdiff.el
+++ b/vdiff.el
@@ -450,8 +450,10 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
;; * Main overlay refresh routine
-(defun vdiff-refresh (&optional post-refresh-hook)
- "Asynchronously refresh diff information."
+(defun vdiff-refresh (&optional post-refresh-function)
+ "Asynchronously refresh diff information.
+
+POST-REFRESH-FUNCTION is called when the process finishes."
(interactive)
(when (vdiff--buffer-p)
(let* ((tmp-a (make-temp-file "vdiff-a-"))
@@ -494,7 +496,7 @@ non-nil. Ignore folds if NO-FOLD is non-nil."
(process-put proc 'vdiff-session ses)
(process-put proc 'vdiff-tmp-a tmp-a)
(process-put proc 'vdiff-tmp-b tmp-b)
- (process-put proc 'vdiff-post-refresh-hook post-refresh-hook)
+ (process-put proc 'vdiff-post-refresh-function post-refresh-function)
(when tmp-c
(process-put proc 'vdiff-tmp-c tmp-c))
(set-process-sentinel proc #'vdiff--diff-refresh-1))))
@@ -576,6 +578,7 @@ parsing the diff output and triggering the overlay updates."
'vdiff--parse-diff3
'vdiff--parse-diff))
(ses (process-get proc 'vdiff-session))
+ (post-function (process-get proc 'vdiff-post-refresh-function))
finished)
(cond
;; Was getting different exit code conventions depending on the
@@ -595,7 +598,8 @@ parsing the diff output and triggering the overlay updates."
(let ((vdiff--session ses))
(when vdiff-auto-refine
(vdiff-refine-all-hunks))
- (run-hooks (process-get proc 'vdiff-post-refresh-hook)))
+ (when post-function
+ (funcall post-function)))
(delete-file (process-get proc 'vdiff-tmp-a))
(delete-file (process-get proc 'vdiff-tmp-b))
(when (process-get proc 'vdiff-tmp-c)
- [elpa] scratch/add-vdiff fa6391e 123/258: Reorg README commands section, (continued)
- [elpa] scratch/add-vdiff fa6391e 123/258: Reorg README commands section, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff a2fbb7b 146/258: Rename diff-program-args, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 3d38f6c 040/258: Fix line endings, Justin Burkett, 2017/05/17
- [elpa] scratch/add-vdiff 5031c90 145/258: Finish new line translation logic, Justin Burkett, 2017/05/17
- [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 <=
- [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, 2017/05/17
- [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