From 52274375fe2a13fc0a246d6ae8c9b073e602ac4a Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Sat, 20 May 2017 11:26:10 -0400
Subject: Set new magit-use-sticky-arguments option to `current'

... and retire workaround.
---
 init.el | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

(limited to 'init.el')

diff --git a/init.el b/init.el
index 2cbfea1..d5aa916 100644
--- a/init.el
+++ b/init.el
@@ -925,6 +925,7 @@
         magit-update-other-window-delay 0.1
         magit-revision-show-gravatars nil
         magit-revision-insert-related-refs nil
+        magit-use-sticky-arguments 'current
         magit-log-show-refname-after-summary t
         magit-log-section-arguments nil)
 
@@ -1011,25 +1012,6 @@
   (magit-change-popup-key 'magit-branch-popup :action
                           ?s ?v)
 
-  (defun km/magit-mode-kill-hidden (mode)
-    (let ((buffer (magit-mode-get-buffer mode)))
-      (unless (or (not buffer)
-                  (get-buffer-window buffer)
-                  (derived-mode-p mode))
-        (kill-buffer buffer))))
-
-  (advice-add 'magit-log-popup
-              :before
-              (lambda (&rest _)
-                (km/magit-mode-kill-hidden 'magit-log-mode))
-              '((name . "magit-log-kill-previous")))
-  (advice-add 'magit-diff-popup
-              :before
-              (lambda (&rest _)
-                (km/magit-mode-kill-hidden 'magit-diff-mode))
-              '((name . "magit-diff-kill-previous")))
-
-
   (advice-add
    'magit-diff-while-committing
    :around
-- 
cgit v1.2.3