From ae5f443debdc361717aad30739ac839b55a7e877 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Wed, 25 Nov 2015 22:29:11 -0500
Subject: magit: Update window configuration settings

... for 82d6786 (magit-{pre,post}-display-buffer-hook: new variables,
2015-10-08).
---
 lisp/init-git.el | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lisp/init-git.el b/lisp/init-git.el
index 2029504..6f15811 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -16,9 +16,7 @@
 (add-to-list 'load-path "~/src/emacs/orgit/")
 (require 'orgit)
 
-(setq magit-restore-window-configuration t
-      magit-bury-buffer-function 'magit-restore-window-configuration
-      magit-revert-buffers 'silent
+(setq magit-revert-buffers 'silent
       magit-push-always-verify nil
       magit-delete-by-moving-to-trash nil
       magit-diff-auto-show-delay 0.1
@@ -32,8 +30,6 @@
 
 (setq git-commit-finish-query-functions nil)
 
-;; http://whattheemacsd.com/setup-magit.el-01.html
-(add-hook 'magit-status-mode-hook 'delete-other-windows)
 (remove-hook 'magit-refs-sections-hook 'magit-insert-tags)
 
 (add-hook 'git-commit-setup-hook
@@ -42,6 +38,11 @@
                       'git-commit-save-message nil t)))
 (add-hook 'git-commit-setup-hook 'git-commit-turn-on-flyspell)
 
+(add-hook 'magit-post-display-buffer-hook
+          (lambda ()
+            (when (eq major-mode 'magit-status-mode)
+              (delete-other-windows))))
+
 (defun km/magit-auto-commit ()
   "Commit all changes with \"auto\" commit message.
 This can be useful for non-source code repos (e.g., Org mode note
-- 
cgit v1.2.3