branch: elpa/magit
commit 279da3b92266c762dda1d53328f65daeb56e7ada
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
git-commit-run-post-finish-hook: Cosmetics
---
lisp/git-commit.el | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 206cef889af..75effce6dec 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -619,17 +619,13 @@ Used as the local value of `header-line-format', in
buffer using
(defun git-commit-run-post-finish-hook (previous)
(when git-commit-post-finish-hook
- (cl-block nil
- (let ((break (time-add (current-time)
- (seconds-to-time
- git-commit-post-finish-hook-timeout))))
- (while (equal (magit-rev-parse "HEAD") previous)
- (if (time-less-p (current-time) break)
- (sit-for 0.01)
- (message "No commit created after 1 second. Not running %s."
- 'git-commit-post-finish-hook)
- (cl-return))))
- (run-hooks 'git-commit-post-finish-hook))))
+ (if (with-timeout (git-commit-post-finish-hook-timeout)
+ (while (equal (magit-rev-parse "HEAD") previous)
+ (sit-for 0.01))
+ t)
+ (run-hooks 'git-commit-post-finish-hook)
+ (message "No commit created after 1 second. Not running %s."
+ 'git-commit-post-finish-hook))))
(define-minor-mode git-commit-mode
"Auxiliary minor mode used when editing Git commit messages.
