From 90d30215ef960ee81d9859e8adaaf72cba3bc4c5 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 7 Nov 2016 15:04:37 -0800 Subject: [PATCH] [Emacs] Use window in frames only mode for magit-diff on commit --- dotfiles/emacs.d/README.org | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index c84b9fef..85ead4cc 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -1189,10 +1189,10 @@ programming mode. ;; XXX: This was a failed attempt to get magit-commit to properly use ;; frames. - ;; (".*magit-diff.*" . ((display-buffer-pop-up-frame) - ;; ((reusable-frames . 0) - ;; (inhibit-switch-frame . t) - ;; (inhibit-same-window . t)))) + (".*magit-diff.*" . ((display-buffer-pop-up-window) + ((reusable-frames . 0) + (inhibit-switch-frame . t) + (inhibit-same-window . t)))) ;; (".*COMMIT_.*MSG.*" . ((display-buffer-pop-up-frame) ;; ((reusable-frames . 0) ;; (inhibit-same-window . t)))) @@ -2050,7 +2050,7 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab :config (progn (when (imalison:use-frames-only) - (setq magit-commit-show-diff nil)) + (setq magit-commit-show-diff t)) (unbind-key "C-j" magit-status-mode-map) (unbind-key "C-j" magit-hunk-section-map) (unbind-key "C-j" magit-file-section-map)