From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 31 Oct 2015 02:41:45 +0000 (+0200)
Subject: Merge commit '078f88ecb797b6cf2cd597417402274dd82402ce' from diff-hl
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/a4a72c07ec3abd4f6a7a6c8dafee1e6bbf118062?hp=b978086952793bc2e8b98f3094fbc0fd81116ee1

Merge commit '078f88ecb797b6cf2cd597417402274dd82402ce' from diff-hl
---

diff --git a/packages/diff-hl/diff-hl.el b/packages/diff-hl/diff-hl.el
index 8790352f1..cd3d01748 100644
--- a/packages/diff-hl/diff-hl.el
+++ b/packages/diff-hl/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.8.0
+;; Version:  1.8.1
 ;; Package-Requires: ((cl-lib "0.2"))
 
 ;; This file is part of GNU Emacs.
@@ -391,7 +391,8 @@ in the source file, or the last line of the hunk above it."
               (when (eobp)
                 (with-current-buffer ,buffer (diff-hl-remove-overlays))
                 (error "Buffer is up-to-date"))
-              (diff-hl-diff-skip-to ,line)
+              (let (diff-auto-refine-mode)
+                (diff-hl-diff-skip-to ,line))
               (save-excursion
                 (while (looking-at "[-+]") (forward-line 1))
                 (setq end-line (line-number-at-pos (point)))
@@ -406,6 +407,8 @@ in the source file, or the last line of the hunk above it."
                 (if (>= wbh (- end-line beg-line))
                     (recenter (/ (+ wbh (- beg-line end-line) 2) 2))
                   (recenter 1)))
+              (when diff-auto-refine-mode
+                (diff-refine-hunk))
               (unless (yes-or-no-p (format "Revert current hunk in %s?"
                                            ,(cl-caadr fileset)))
                 (error "Revert canceled"))