awesome-emacs/doomemacs
1
0
Fork 0
mirror of https://github.com/doomemacs/doomemacs synced 2025-08-01 12:17:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix revert-buffer--default error after using magit

Browse Source 
It too aggressively tries to revert all buffers, even ones that can't be
reverted.
This commit is contained in:
Henrik Lissner
2020-02-24 19:23:37 -05:00
parent 1f3ff33762
commit 24282a454e
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/tools/magit/autoload.el
View File

@ -43,12 +43,17 @@
;; ;;
;;; Auto-revert ;;; Auto-revert
(defvar-local +magit--stale-p nil) (defvar +magit--stale-p nil)
(defun +magit--revert-buffer (buffer) (defun +magit--revert-buffer (buffer)
(with-current-buffer buffer (with-current-buffer buffer
(setq +magit--stale-p nil) (kill-local-variable '+magit--stale-p)
(revert-buffer t (not (buffer-modified-p))))) (if (buffer-file-name (buffer-base-buffer))
(and (or (not (buffer-modified-p))
(y-or-n-p "Version control data is outdated in this buffer, but it is unsaved. Revert anyway?"))
(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 ()
@ -61,7 +66,7 @@ modified."
(if (get-buffer-window buffer) (if (get-buffer-window buffer)
(+magit--revert-buffer buffer) (+magit--revert-buffer buffer)
(with-current-buffer buffer (with-current-buffer buffer
(setq +magit--stale-p t)))))) (setq-local +magit--stale-p t))))))
;;;###autoload ;;;###autoload
(defun +magit-revert-buffer-maybe-h () (defun +magit-revert-buffer-maybe-h ()