From d4c02bcd088d61aa4983076245a27a59db9aa404 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Wed, 2 Apr 2025 06:37:12 -0400 Subject: [PATCH] refactor(magit): reduce pollution of global namespace --- modules/tools/magit/config.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el index 8430124db..9c6034678 100644 --- a/modules/tools/magit/config.el +++ b/modules/tools/magit/config.el @@ -65,16 +65,16 @@ Only has an effect in GUI Emacs.") ;; Prevent sudden window position resets when staging/unstaging/discarding/etc ;; hunks in `magit-status-mode' buffers. It's disorienting, especially on ;; larger projects. - (defvar +magit--pos nil) - (add-hook! 'magit-pre-refresh-hook - (defun +magit--set-window-state-h () - (setq-local +magit--pos (list (current-buffer) (point) (window-start))))) - (add-hook! 'magit-post-refresh-hook - (defun +magit--restore-window-state-h () - (when (and +magit--pos (eq (current-buffer) (car +magit--pos))) - (goto-char (cadr +magit--pos)) - (set-window-start nil (caddr +magit--pos) t) - (kill-local-variable '+magit--pos)))) + (let (magit--pos) + (add-hook! 'magit-pre-refresh-hook + (defun +magit--set-window-state-h () + (setq-local magit--pos (list (current-buffer) (point) (window-start))))) + (add-hook! 'magit-post-refresh-hook + (defun +magit--restore-window-state-h () + (when (and magit--pos (eq (current-buffer) (car magit--pos))) + (goto-char (cadr magit--pos)) + (set-window-start nil (caddr magit--pos) t) + (kill-local-variable 'magit--pos))))) ;; Magit uses `magit-display-buffer-traditional' to display windows, by ;; default, which is a little primitive. `+magit-display-buffer' marries