branch: elpa/magit commit e548fe5c823720b27ad24c186a49f8cb8c3b8529 Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
magit-refresh-buffer: Avoid resetting when first creating buffer --- lisp/magit-mode.el | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el index 4217ab9f05..868ff7dcc3 100644 --- a/lisp/magit-mode.el +++ b/lisp/magit-mode.el @@ -1076,18 +1076,21 @@ Run hooks `magit-pre-refresh-hook' and `magit-post-refresh-hook'." (magit--refresh-cache (or magit--refresh-cache (list (cons 0 0))))) (when magit-refresh-verbose (message "Refreshing buffer `%s'..." (buffer-name))) - (deactivate-mark) - (setq magit-section-pre-command-section nil) - (setq magit-section-highlight-overlays nil) - (setq magit-section-selection-overlays nil) - (setq magit-section-highlighted-sections nil) - (setq magit-section-focused-sections nil) - (let ((positions (magit--refresh-buffer-get-positions))) + (cond + (created (funcall refresh) - (magit--refresh-buffer-set-positions positions)) - (when created (run-hooks 'magit--initial-section-hook) (setq-local magit--initial-section-hook nil)) + (t + (deactivate-mark) + (setq magit-section-pre-command-section nil) + (setq magit-section-highlight-overlays nil) + (setq magit-section-selection-overlays nil) + (setq magit-section-highlighted-sections nil) + (setq magit-section-focused-sections nil) + (let ((positions (magit--refresh-buffer-get-positions))) + (funcall refresh) + (magit--refresh-buffer-set-positions positions)))) (let ((magit-section-cache-visibility nil)) (magit-section-show magit-root-section)) (run-hooks 'magit-refresh-buffer-hook)