mirror of
https://github.com/pestctrl/emacs-config.git
synced 2026-06-14 04:11:18 +00:00
Hmmm, I can't fix this in a clean way, and I'm not sure why...
This commit is contained in:
parent
cb3018c8f3
commit
78ee56cf62
2 changed files with 39 additions and 3 deletions
|
|
@ -508,8 +508,7 @@
|
|||
'(display-buffer-in-side-window
|
||||
(side . left)
|
||||
(dedicated . t)
|
||||
(inhibit-same-window . t)
|
||||
(window-parameters (no-other-window . t))))
|
||||
(inhibit-same-window . t)))
|
||||
(global-set-key (kbd "C-x g") 'magit-status)
|
||||
(global-set-key (kbd "C-x M-g") 'magit-dispatch)
|
||||
(require 'magit-overrides)
|
||||
|
|
|
|||
|
|
@ -163,9 +163,9 @@
|
|||
transient-display-buffer-action)))
|
||||
(when (window-live-p transient--window)
|
||||
(with-selected-window transient--window
|
||||
;; Save the previous value of the 'no-other-window window parameter.
|
||||
(set-window-parameter nil 'prev--no-other-window
|
||||
(window-parameter nil 'no-other-window))
|
||||
(set-window-parameter nil 'no-other-window t)
|
||||
(goto-char (point-min))
|
||||
(when transient-enable-popup-navigation
|
||||
(transient--goto-button focus))
|
||||
|
|
@ -175,5 +175,42 @@
|
|||
:override
|
||||
#'my/transient--show)
|
||||
|
||||
;; What's so great about the above advice? Why can't the below work?!
|
||||
;;
|
||||
;; (defun my/transient--show-post ()
|
||||
;; (let ((transient--shadowed-buffer (current-buffer))
|
||||
;; (focus nil))
|
||||
;; (setq transient--buffer (get-buffer-create transient--buffer-name))
|
||||
;; (with-current-buffer transient--buffer
|
||||
;; (when transient-enable-popup-navigation
|
||||
;; (setq focus (or (button-get (point) 'command)
|
||||
;; (and (not (bobp))
|
||||
;; (button-get (1- (point)) 'command))
|
||||
;; (transient--heading-at-point)))))
|
||||
;; (when (window-live-p transient--window)
|
||||
;; (with-selected-window transient--window
|
||||
;; (set-window-parameter nil 'prev--no-other-window
|
||||
;; (window-parameter nil 'no-other-window))
|
||||
;; (set-window-parameter nil 'no-other-window t)
|
||||
;; (goto-char (point-min))
|
||||
;; (when transient-enable-popup-navigation
|
||||
;; (transient--goto-button focus))
|
||||
;; (transient--fit-window-to-buffer transient--window)))))
|
||||
|
||||
;; (advice-add #'transient--show
|
||||
;; :after
|
||||
;; #'my/transient--show-post)
|
||||
|
||||
(defun my/transient--delete-win-restore-window-param (&rest ignore)
|
||||
(when (window-live-p transient--window)
|
||||
(with-selected-window transient--window
|
||||
;; Restore the value
|
||||
(set-window-parameter nil 'no-other-window
|
||||
(window-parameter nil 'prev--no-other-window)))))
|
||||
|
||||
(advice-add #'transient--delete-window
|
||||
:before
|
||||
#'my/transient--delete-win-restore-window-param)
|
||||
|
||||
(provide 'magit-overrides)
|
||||
;;; magit-overrides.el ends here
|
||||
|
|
|
|||
Loading…
Reference in a new issue