From 1a8ae4d451805fe2e1584383cdb8f543b219b676 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 9 Sep 2016 08:39:38 +0200 Subject: [PATCH] magit: remove popup hackery (isn't needed anymore + see #6) --- core/core-vcs.el | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/core/core-vcs.el b/core/core-vcs.el index 643826a4a..000314eb4 100644 --- a/core/core-vcs.el +++ b/core/core-vcs.el @@ -51,28 +51,9 @@ (use-package magit :commands (magit-status) :config - (def-popup! (:custom (lambda (b &rest _) (derived-mode-p 'magit-mode))) - :align below :size 0.5) - - ;; Some wrassling must be done to get magit to kill itself, and trigger - ;; shackle popup hooks. - (setq magit-bury-buffer-function - (lambda (&rest _) (doom/popup-close (selected-window))) - magit-display-buffer-function - (lambda (b) - (funcall (if (doom/popup-p (selected-window)) 'switch-to-buffer 'doom/popup-buffer) b) - (get-buffer-window b)) - magit-display-file-buffer-function - (lambda (b) - (when doom-prev-buffer - (select-window (get-buffer-window doom-prev-buffer))) - (switch-to-buffer b))) - ;; Prevent magit and evil-snipe conflicts (add-hook 'magit-mode-hook 'turn-off-evil-snipe-override-mode) - - (require 'evil-magit) - (evil-set-initial-state 'magit-popup-mode 'normal)) + (require 'evil-magit)) (after! vc-annotate (evil-set-initial-state 'vc-annotate-mode 'normal)