branch: externals/diff-hl
commit a0c085c16246f0a5437323df6b357afbc87f4c71
Author: Dmitry Gutov <dmi...@gutov.dev>
Commit: Dmitry Gutov <dmi...@gutov.dev>
Try to reset the margin unobtrusively (if the default is 0 still)
---
diff-hl.el | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/diff-hl.el b/diff-hl.el
index 9c460063b9..ebb74305b1 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -504,7 +504,9 @@ It can be a relative expression as well, such as \"HEAD^\"
with Git, or
(let ((width-var (intern (format "%s-margin-width" diff-hl-side))))
(when (and diff-hl-autohide-margin
(> (symbol-value width-var) 0))
- (set width-var 0)
+ (if (eql (default-value width-var) 0)
+ (kill-local-variable width-var)
+ (set width-var 0))
(dolist (win (get-buffer-window-list))
(set-window-buffer win (current-buffer))))))
