el/dot-emacs.el: Don't select the designated window when displaying buffer.

[profile] / el / dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 12c3b21..fc219b2 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -677,8 +677,8 @@ With a prefix argument, clear the designated window."
   "Display function to use the designated window."
   (prog1 mdw-designated-window
     (when mdw-designated-window
-      (select-window mdw-designated-window)
-      (switch-to-buffer buffer nil t))
+      (with-selected-window mdw-designated-window
+       (switch-to-buffer buffer nil t)))
     (setq mdw-designated-window nil)))
 
 (setq display-buffer-base-action
@@ -5205,6 +5205,11 @@ rather than baking the list into the function."
                      nil))))
 (setq magit-display-buffer-function 'mdw-display-magit-buffer)
 
+(defun mdw-display-magit-file-buffer (buffer)
+  "Show a file buffer from a diff."
+  (select-window (display-buffer buffer)))
+(setq magit-display-file-buffer-function 'mdw-display-magit-file-buffer)
+
 ;;;--------------------------------------------------------------------------
 ;;; GUD, and especially GDB.