colonelpanic/dotfiles
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Emacs] Disable showing of diff when using frames mode

Browse Source 
I couldn't get the diff popup to play nicely with frames-only no matter
how much I tweaked display-buffer-alist.
This commit is contained in:
Ivan Malison 2016-11-07 15:01:14 -08:00
parent aa563669ff
commit 6a339b8a88
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dotfiles/emacs.d/README.org
View File

@ -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)))) (org-show-context 'magit-goto))))
:config :config
(progn (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-status-mode-map)
(unbind-key "C-j" magit-hunk-section-map) (unbind-key "C-j" magit-hunk-section-map)
(unbind-key "C-j" magit-file-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)) (add-to-list 'org-show-context-detail '(magit-goto . lineage))
(advice-add 'magit-diff-visit-file :after 'imalison:after-magit-visit-file) (advice-add 'magit-diff-visit-file :after 'imalison:after-magit-visit-file)
(add-hook 'magit-popup-mode-hook 'imalison:disable-show-trailing-whitespace) (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))))
#+END_SRC #+END_SRC
*** magithub *** magithub
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp