- (if (and (not mdw-designated-window)
- (derived-mode-p 'magit-mode)
- (not (memq (with-current-buffer buffer major-mode)
- mdw-magit-new-window-modes)))
- '(display-buffer-same-window . nil)
- nil)))
+ (let ((mode (with-current-buffer buffer major-mode)))
+ (if (and (not mdw-designated-window)
+ (derived-mode-p 'magit-mode)
+ (mdw-submode-p mode 'magit-mode)
+ (not (memq mode mdw-magit-new-window-modes)))
+ '(display-buffer-same-window . nil)
+ nil))))