Skip to content

Commit

Permalink
Fix non-appearance of Magit COMMIT_MSG buffer
Browse files Browse the repository at this point in the history
Fixed by getting rid of `nomis/magit-display-buffer-function`,
which was a fix for the following problem that seems to have gone away:
    > Have Magit status buffer open in same window
    > See magit/magit#2541
  • Loading branch information
simon-katz committed Sep 10, 2017
1 parent b469670 commit 004e9bb
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions emacs-installation/emacs-init-files/nomis-magit.el
Expand Up @@ -2,20 +2,6 @@

;;;; ___________________________________________________________________________

(defun nomis/magit-display-buffer-function (buffer)
;; Have Magit status buffer open in same window
;; See https://github.com/magit/magit/issues/2541
(display-buffer buffer
(if (and (derived-mode-p 'magit-mode)
(memq (with-current-buffer buffer major-mode)
'(magit-process-mode
magit-revision-mode
magit-diff-mode
magit-stash-mode
magit-status-mode)))
nil
'(display-buffer-same-window))))

(defun nomis-init-magit ()

;; FIXME: Much of this is no longer A Thing.
Expand All @@ -31,11 +17,7 @@
(setq magit-push-always-verify nil)
(setq magit-diff-refine-hunk 'all)
(setq magit-diff-highlight-trailing nil)
(setq git-commit-summary-max-length 999)

(when (equal magit-version "2.10.3")
(setq magit-display-buffer-function
'nomis/magit-display-buffer-function)))
(setq git-commit-summary-max-length 999))


(add-hook 'magit-mode-hook 'nomis-init-magit)
Expand Down

0 comments on commit 004e9bb

Please sign in to comment.