[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 71c5ea9 4/4: Merge commit '374b1d4b34876219218da7a539e7301
From: |
Dmitry Gutov |
Subject: |
[elpa] master 71c5ea9 4/4: Merge commit '374b1d4b34876219218da7a539e7301259b56958' from diff-hl |
Date: |
Sun, 7 Jul 2019 19:07:14 -0400 (EDT) |
branch: master
commit 71c5ea90d9af25a98b60a0b3ce2ff809b361b56a
Merge: 9b44fcb 374b1d4
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge commit '374b1d4b34876219218da7a539e7301259b56958' from diff-hl
---
packages/diff-hl/diff-hl.el | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/packages/diff-hl/diff-hl.el b/packages/diff-hl/diff-hl.el
index c467729..22bb816 100644
--- a/packages/diff-hl/diff-hl.el
+++ b/packages/diff-hl/diff-hl.el
@@ -5,7 +5,7 @@
;; Author: Dmitry Gutov <address@hidden>
;; URL: https://github.com/dgutov/diff-hl
;; Keywords: vc, diff
-;; Version: 1.8.6
+;; Version: 1.8.7
;; Package-Requires: ((cl-lib "0.2") (emacs "24.3"))
;; This file is part of GNU Emacs.
@@ -248,17 +248,17 @@ the end position as its only argument."
diff-hl-reference-revision))))
(defun diff-hl-changes-buffer (file backend)
+ ;; FIXME: To diff against the staging area, call 'git diff-files -p'.
(let ((buf-name " *diff-hl* "))
(condition-case err
(diff-hl-with-diff-switches
- ;; FIXME: To diff against the staging area, call 'git diff-files -p'.
(vc-call-backend backend 'diff (list file)
diff-hl-reference-revision nil
buf-name))
(error
+ ;; https://github.com/dgutov/diff-hl/issues/117
(when (string-match-p "\\`Failed (status 128)" (error-message-string
err))
(diff-hl-with-diff-switches
- ;; FIXME: To diff against the staging area, call 'git diff-files -p'.
(vc-call-backend backend 'diff (list file)
"4b825dc642cb6eb9a060e54bf8d69288fbee4904"
nil
@@ -546,7 +546,6 @@ The value of this variable is a mode line template as in
;; Magit versions 2.0-2.3 don't do the above and call this
;; instead, but only when they dosn't call `revert-buffer':
(add-hook 'magit-not-reverted-hook 'diff-hl-update nil t)
- (add-hook 'auto-revert-mode-hook 'diff-hl-update nil t)
(add-hook 'text-scale-mode-hook 'diff-hl-maybe-redefine-bitmaps nil t))
(remove-hook 'after-save-hook 'diff-hl-update t)
(remove-hook 'after-change-functions 'diff-hl-edit t)
@@ -555,7 +554,6 @@ The value of this variable is a mode line template as in
(remove-hook 'after-revert-hook 'diff-hl-update t)
(remove-hook 'magit-revert-buffer-hook 'diff-hl-update t)
(remove-hook 'magit-not-reverted-hook 'diff-hl-update t)
- (remove-hook 'auto-revert-mode-hook 'diff-hl-update t)
(remove-hook 'text-scale-mode-hook 'diff-hl-maybe-redefine-bitmaps t)
(diff-hl-remove-overlays)))