branch: externals/diff-hl
commit 90db5cacd073fd98d11d5295607455b21ce9c864
Author: Dmitry Gutov <[email protected]>
Commit: Dmitry Gutov <[email protected]>
Switch static-if checks to use boundp and fboundp
Resolves #263
---
diff-hl.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/diff-hl.el b/diff-hl.el
index 4837ef1623..2bc502a41b 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -421,7 +421,7 @@ It can be a relative expression as well, such as \"HEAD^\"
with Git, or
(or (memq state '(edited conflict))
(and (eq state 'up-to-date)
;; VC state is stale in after-revert-hook.
- (or (static-if (>= emacs-major-version 31)
+ (or (static-if (boundp 'revert-buffer-in-progress)
revert-buffer-in-progress
revert-buffer-in-progress-p)
;; Diffing against an older revision.
@@ -740,7 +740,7 @@ Return a list of line overlays used."
(defun diff-hl--resolve (value-or-buffer cb)
(if (listp value-or-buffer)
(funcall cb value-or-buffer)
- (static-if (>= emacs-major-version 31)
+ (static-if (fboundp 'vc-run-delayed-success)
(with-current-buffer value-or-buffer
(vc-run-delayed-success 1
(funcall cb (diff-hl-changes-from-buffer (current-buffer)))))
