From 93521ba5beace54462b0b7be1f11b7ebfbb589c9 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 14 Mar 2020 22:04:30 -0400 Subject: [PATCH] Prevent "version control data is outdated" prompt The prompt was too intrusive, so update vc state if buffer is modified instead. --- modules/tools/magit/autoload.el | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/modules/tools/magit/autoload.el b/modules/tools/magit/autoload.el index 1c085813a..22259c480 100644 --- a/modules/tools/magit/autoload.el +++ b/modules/tools/magit/autoload.el @@ -48,16 +48,13 @@ (defun +magit--revert-buffer (buffer) (with-current-buffer buffer (kill-local-variable '+magit--stale-p) - (let ((buffer (or (buffer-base-buffer) (current-buffer)))) - (if-let (file (buffer-file-name buffer)) - (and (file-exists-p file) - (or (not (buffer-modified-p buffer)) - (y-or-n-p - (format "Version control data is outdated in %s, but it is unsaved. Revert anyway?" - buffer))) - (revert-buffer t t)) - (when (and vc-mode (fboundp 'vc-refresh-state)) - (vc-refresh-state)))))) + (let* ((buffer (or (buffer-base-buffer) (current-buffer))) + (file (buffer-file-name buffer))) + (if (or (buffer-modified-p buffer) + (and file (file-exists-p file))) + (when (bound-and-true-p vc-mode) + (vc-refresh-state)) + (revert-buffer t t))))) ;;;###autoload (defun +magit-mark-stale-buffers-h ()