From 83425894009645b57eeb2dd5b4fe781394bf0ac8 Mon Sep 17 00:00:00 2001 From: tastytea Date: Sun, 26 Jan 2020 21:45:56 +0100 Subject: [PATCH] Emacs: Workaround for magit split problem. --- init.d/programming/common.el | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/init.d/programming/common.el b/init.d/programming/common.el index 119376d..fe1832c 100644 --- a/init.d/programming/common.el +++ b/init.d/programming/common.el @@ -1,6 +1,6 @@ ;;; common.el --- Common programming settings. -*- lexical-binding: t; -*- -;; Time-stamp: <2020-01-26T09:05:30+0100> +;; Time-stamp: <2020-01-26T20:35:54+0100> ;;; Commentary: @@ -265,13 +265,17 @@ (magit-diff-refine-hunk 'all) ; Show word-granularity differences. :config - (defun my/split-vertically () - "Split buffers vertically if focused window is dedicated to a -purpose or not wide enough." - (when (or (purpose-window-purpose-dedicated-p) - (< (window-total-width) 160)) - (setq-local split-height-threshold 40) - )) + (defun my/magit-display-buffer (buffer) + "Workaround to ensure that BUFFER is split vertically if necessary." + (if (and git-commit-mode + (with-current-buffer buffer + (derived-mode-p 'magit-diff-mode))) + (display-buffer buffer '((display-buffer-pop-up-window + display-buffer-use-some-window + display-buffer-below-selected) + (inhibit-same-window . t))) + (magit-display-buffer-traditional buffer))) + (setq magit-display-buffer-function #'my/magit-display-buffer) :bind ("C-x g" . magit-status) @@ -279,8 +283,6 @@ purpose or not wide enough." :hook (after-save . magit-after-save-refresh-status) - ;; (magit-pre-display-buffer . my/split-vertically) - ;; (git-commit-setup . my/split-vertically) ) ;; Use libgit rather than git.