[elpa] externals/diff-hl 8f2e4eb345: Save previous margin width in diff-hl-margin-old-width

[ELPA Syncer]

branch: externals/diff-hl
commit 8f2e4eb345f0639c8fc41e3f7576f77ba6987655
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    Save previous margin width in diff-hl-margin-old-width
    
    Closes #194
---
 diff-hl-margin.el | 14 +++++++++-----
 diff-hl.el        |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/diff-hl-margin.el b/diff-hl-margin.el
index b9d7bdfbd1..c3fffde14e 100644
--- a/diff-hl-margin.el
+++ b/diff-hl-margin.el
@@ -40,6 +40,8 @@
 
 (defvar diff-hl-margin-old-highlight-function nil)
 
+(defvar diff-hl-margin-old-width nil)
+
 (defgroup diff-hl-margin nil
   "Highlight buffer changes on margin"
   :group 'diff-hl)
@@ -108,15 +110,17 @@ You probably shouldn't use this function directly."
   (let ((width-var (intern (format "%s-margin-width" diff-hl-side))))
     (if diff-hl-margin-local-mode
         (progn
-          (set (make-local-variable 'diff-hl-margin-old-highlight-function)
-               diff-hl-highlight-function)
-          (set (make-local-variable 'diff-hl-highlight-function)
-               'diff-hl-highlight-on-margin)
+          (setq-local diff-hl-margin-old-highlight-function
+                      diff-hl-highlight-function)
+          (setq-local diff-hl-highlight-function
+                      #'diff-hl-highlight-on-margin)
+          (setq-local diff-hl-margin-old-width (symbol-value width-var))
           (set width-var 1))
       (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)))
+      (set width-var diff-hl-margin-old-width)
+      (kill-local-variable 'diff-hl-margin-old-width)))
   (dolist (win (get-buffer-window-list))
     (set-window-buffer win (current-buffer))))
 
diff --git a/diff-hl.el b/diff-hl.el
index db6d1bb3cb..1ce3978f08 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -5,7 +5,7 @@
 ;; Author:   Dmitry Gutov <dgutov@yandex.ru>
 ;; URL:      https://github.com/dgutov/diff-hl
 ;; Keywords: vc, diff
-;; Version:  1.9.0
+;; Version:  1.9.1
 ;; Package-Requires: ((cl-lib "0.2") (emacs "25.1"))
 
 ;; This file is part of GNU Emacs.