From 6a339b8a889d070b954d553233ceeef9b4316ae0 Mon Sep 17 00:00:00 2001 From: Ivan Malison Date: Mon, 7 Nov 2016 15:01:14 -0800 Subject: [PATCH] [Emacs] Disable showing of diff when using frames mode I couldn't get the diff popup to play nicely with frames-only no matter how much I tweaked display-buffer-alist. --- dotfiles/emacs.d/README.org | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dotfiles/emacs.d/README.org b/dotfiles/emacs.d/README.org index 0fc48e5a..9d6b245b 100644 --- a/dotfiles/emacs.d/README.org +++ b/dotfiles/emacs.d/README.org @@ -2029,6 +2029,8 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab (org-show-context 'magit-goto)))) :config (progn + (when (imalison:use-frames-only) + (setq magit-commit-show-diff nil)) (unbind-key "C-j" magit-status-mode-map) (unbind-key "C-j" magit-hunk-section-map) (unbind-key "C-j" magit-file-section-map) @@ -2043,13 +2045,7 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab (add-to-list 'org-show-context-detail '(magit-goto . lineage)) (advice-add 'magit-diff-visit-file :after 'imalison:after-magit-visit-file) - (add-hook 'magit-popup-mode-hook 'imalison:disable-show-trailing-whitespace) - (use-package magit-filenotify - ;; Seems like OSX does not support filenotify. - :disabled t - :if (funcall (emacs-version-predicate 24 4)) - :config - :init (add-hook 'magit-status-mode-hook 'magit-filenotify-mode)))) + (add-hook 'magit-popup-mode-hook 'imalison:disable-show-trailing-whitespace))) #+END_SRC *** magithub #+BEGIN_SRC emacs-lisp