[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/diff-hl 68fb280b30 2/2: Merge pull request #192 from ma
From: |
ELPA Syncer |
Subject: |
[elpa] externals/diff-hl 68fb280b30 2/2: Merge pull request #192 from mattbeshara/master |
Date: |
Fri, 7 Oct 2022 17:57:38 -0400 (EDT) |
branch: externals/diff-hl
commit 68fb280b300c5d8460cc7b9183e29fb3ec604136
Merge: 5d90cca340 d380a26466
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: GitHub <noreply@github.com>
Merge pull request #192 from mattbeshara/master
Prevent Tramp and `diff-hl-flydiff-mode` from making Emacs unusable if the
remote host disappears
---
diff-hl-flydiff.el | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/diff-hl-flydiff.el b/diff-hl-flydiff.el
index 1410b2c7d1..bb3d47748b 100644
--- a/diff-hl-flydiff.el
+++ b/diff-hl-flydiff.el
@@ -49,8 +49,8 @@
(not diff-hl-mode)
(eq diff-hl-flydiff-modified-tick (buffer-chars-modified-tick))
(not buffer-file-name)
- (not (file-exists-p buffer-file-name))
- (file-remote-p default-directory))
+ (file-remote-p default-directory)
+ (not (file-exists-p buffer-file-name)))
(diff-hl-update)))
(defun diff-hl-flydiff/modified-p (_state)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [elpa] externals/diff-hl 68fb280b30 2/2: Merge pull request #192 from mattbeshara/master,
ELPA Syncer <=