branch: externals/diff-hl
commit ccf89ec8eef189f8191622cf30867c526d1174d7
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: Dmitry Gutov <dgu...@yandex.ru>
Fix #128
---
diff-hl-margin.el | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index dfc1928..e3fd9c8 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -112,8 +112,9 @@ You probably shouldn't use this function directly."
(set (make-local-variable 'diff-hl-highlight-function)
'diff-hl-highlight-on-margin)
(set width-var 1))
- (setq diff-hl-highlight-function diff-hl-margin-old-highlight-function
- diff-hl-margin-old-highlight-function nil)
+ (when diff-hl-margin-old-highlight-function
+ (setq diff-hl-highlight-function diff-hl-margin-old-highlight-function
+ diff-hl-margin-old-highlight-function nil))
(set width-var 0)))
(dolist (win (get-buffer-window-list))
(set-window-buffer win (current-buffer))))
