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

revert: refactor(magit): reduce pollution of global namespace

Browse Source 
This refactor was premature. It still worked, but only by accident.

This is not a *full* revert; +magit--pos has been renamed for clarity.

Revert: d4c02bcd08
This commit is contained in:
Henrik Lissner
2025-04-04 00:44:37 -04:00
parent e91a5edd31
commit f98eb3824f
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/tools/magit/config.el
View File

@ -65,16 +65,18 @@ Only has an effect in GUI Emacs.")
;; Prevent sudden window position resets when staging/unstaging/discarding/etc ;; Prevent sudden window position resets when staging/unstaging/discarding/etc
;; hunks in `magit-status-mode' buffers. It's disorienting, especially on ;; hunks in `magit-status-mode' buffers. It's disorienting, especially on
;; larger projects. ;; larger projects.
(let (magit--pos) (defvar +magit--refreshed-buffer nil)
(add-hook! 'magit-pre-refresh-hook (add-hook! 'magit-pre-refresh-hook
(defun +magit--set-window-state-h () (defun +magit--set-window-state-h ()
(setq-local magit--pos (list (current-buffer) (point) (window-start))))) (setq-local +magit--refreshed-buffer
(list (current-buffer) (point) (window-start)))))
(add-hook! 'magit-post-refresh-hook (add-hook! 'magit-post-refresh-hook
(defun +magit--restore-window-state-h () (defun +magit--restore-window-state-h ()
(when (and magit--pos (eq (current-buffer) (car magit--pos))) (cl-destructuring-bind (&optional buf pt beg) +magit--refreshed-buffer
(goto-char (cadr magit--pos)) (when (and buf (eq (current-buffer) buf))
(set-window-start nil (caddr magit--pos) t) (goto-char pt)
(kill-local-variable 'magit--pos))))) (set-window-start nil beg t)
(kill-local-variable '+magit--refreshed-buffer)))))
;; Magit uses `magit-display-buffer-traditional' to display windows, by ;; Magit uses `magit-display-buffer-traditional' to display windows, by
;; default, which is a little primitive. `+magit-display-buffer' marries ;; default, which is a little primitive. `+magit-display-buffer' marries