emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Prevent "version control data is outdated" prompt

Browse source 
The prompt was too intrusive, so update vc state if buffer is modified
instead.
This commit is contained in:
Henrik Lissner 2020-03-14 22:04:30 -04:00
parent c1046231ce
commit 93521ba5be
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
modules/tools/magit/autoload.el
View file

@ -48,16 +48,13 @@
(defun +magit--revert-buffer (buffer) (defun +magit--revert-buffer (buffer)
(with-current-buffer buffer (with-current-buffer buffer
(kill-local-variable '+magit--stale-p) (kill-local-variable '+magit--stale-p)
(let ((buffer (or (buffer-base-buffer) (current-buffer)))) (let* ((buffer (or (buffer-base-buffer) (current-buffer)))
(if-let (file (buffer-file-name buffer)) (file (buffer-file-name buffer)))
(and (file-exists-p file) (if (or (buffer-modified-p buffer)
(or (not (buffer-modified-p buffer)) (and file (file-exists-p file)))
(y-or-n-p (when (bound-and-true-p vc-mode)
(format "Version control data is outdated in %s, but it is unsaved. Revert anyway?" (vc-refresh-state))
buffer))) (revert-buffer t t)))))
(revert-buffer t t))
(when (and vc-mode (fboundp 'vc-refresh-state))
(vc-refresh-state))))))
;;;###autoload ;;;###autoload
(defun +magit-mark-stale-buffers-h () (defun +magit-mark-stale-buffers-h ()