[Emacs] Use window in frames only mode for magit-diff on commit

This commit is contained in:
Ivan Malison 2016-11-07 15:04:37 -08:00
parent c71bbd59a8
commit 90d30215ef
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8

View File

@ -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)