[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master f0b945a 14/25: Don't call vc-state unless the file exists
From: |
Dmitry Gutov |
Subject: |
[elpa] master f0b945a 14/25: Don't call vc-state unless the file exists |
Date: |
Sat, 8 Dec 2018 19:19:39 -0500 (EST) |
branch: master
commit f0b945a4c4ac31cfccd72e885bacae652d3765f9
Author: Wilfred Hughes <address@hidden>
Commit: Wilfred Hughes <address@hidden>
Don't call vc-state unless the file exists
If a buffer is visiting a file whose parent directory has been
renamed, vc-state throws an error because (buffer-file-path) no longer
points to an existing file.
Ensure that we never call vc-state when the file doesn't exist. This
issue can occur with diff-hl-flydiff, or when using
diff-hl-magit-post-refresh as documented in the readme.
This change causes diff-hl to stop highlighting in the current buffer,
which is the best we can do when we can't find the file.
---
diff-hl-flydiff.el | 1 +
diff-hl.el | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/diff-hl-flydiff.el b/diff-hl-flydiff.el
index 627840e..5b1522c 100644
--- a/diff-hl-flydiff.el
+++ b/diff-hl-flydiff.el
@@ -140,6 +140,7 @@ This requires the external program `diff' to be in your
`exec-path'."
(unless (or
(not diff-hl-mode)
(= diff-hl-flydiff-modified-tick (buffer-modified-tick))
+ (not (file-exists-p (buffer-file-name)))
(file-remote-p default-directory))
(diff-hl-update)))
diff --git a/diff-hl.el b/diff-hl.el
index d882eb1..86d9cc6 100644
--- a/diff-hl.el
+++ b/diff-hl.el
@@ -549,7 +549,8 @@ The value of this variable is a mode line template as in
;; (diff-hl-mode could be non-nil there, even if
;; buffer-file-name is nil):
(buffer-file-name buf)
- (file-in-directory-p (buffer-file-name buf) topdir))
+ (file-in-directory-p (buffer-file-name buf) topdir)
+ (file-exists-p (buffer-file-name buf)))
(with-current-buffer buf
(let* ((file buffer-file-name)
(backend (vc-backend file)))
- [elpa] master f8ce39d 01/25: Solve the "cloned indirect buffer" problem, (continued)
- [elpa] master f8ce39d 01/25: Solve the "cloned indirect buffer" problem, Dmitry Gutov, 2018/12/08
- [elpa] master fa74f2f 04/25: Merge pull request #80 from ryuslash/master, Dmitry Gutov, 2018/12/08
- [elpa] master 6a09f77 06/25: Merge pull request #81 from Wilfred/user_error_no_hunks, Dmitry Gutov, 2018/12/08
- [elpa] master 04c3b01 05/25: Use `user-error' when we can't proceed., Dmitry Gutov, 2018/12/08
- [elpa] master c476e40 07/25: Update the Requirements section, Dmitry Gutov, 2018/12/08
- [elpa] master 8dab389 09/25: Add separate set of faces for diff-hl-margin-mode, Dmitry Gutov, 2018/12/08
- [elpa] master 1d672dd 11/25: Clarify diff-hl-flydiff-mode docstring, Dmitry Gutov, 2018/12/08
- [elpa] master 3e9d264 08/25: Clean up diff-hl-dired process buffers, Dmitry Gutov, 2018/12/08
- [elpa] master 09b9354 12/25: Add a variable for the diff-hl-mode lighter, Dmitry Gutov, 2018/12/08
- [elpa] master bec9889 13/25: Define diff-hl-margin-unknown and diff-hl-margin-ignored, Dmitry Gutov, 2018/12/08
- [elpa] master f0b945a 14/25: Don't call vc-state unless the file exists,
Dmitry Gutov <=
- [elpa] master ce93571 19/25: Add some FIXMEs related to #71, Dmitry Gutov, 2018/12/08
- [elpa] master 9ef21e4 15/25: Merge pull request #93 from Wilfred/handle_file_move, Dmitry Gutov, 2018/12/08
- [elpa] master 027b0d2 20/25: diff-hl-revert-hunk: Emphasize the hunk, Dmitry Gutov, 2018/12/08
- [elpa] master 069a925 24/25: Bump the version, Dmitry Gutov, 2018/12/08
- [elpa] master a626bf8 23/25: Merge pull request #109 from edkolev/revert-hunk-in-narrowed-buffer, Dmitry Gutov, 2018/12/08
- [elpa] master a48699f 21/25: #111 Extract diff-hl-highlight-revert-hunk-function, Dmitry Gutov, 2018/12/08
- [elpa] master 154c64a 18/25: Merge pull request #105 from phst/license, Dmitry Gutov, 2018/12/08
- [elpa] master 63f1687 10/25: diff-hl-dired-update: Handle up-to-date entries properly, Dmitry Gutov, 2018/12/08
- [elpa] master 190622d 16/25: Fix #102, Dmitry Gutov, 2018/12/08
- [elpa] master 93aa34d 22/25: Make sure buffer is not narrowed when reverting a hunk, Dmitry Gutov, 2018/12/08