wgester/dotfiles
1
0
Fork 0
forked from colonelpanic/dotfiles
Code Pull Requests Activity

[Emacs] Make magit-status open in current buffer

Browse Source
This commit is contained in:
Ivan Malison 2016-10-28 14:34:49 -07:00
parent 0f5a53ffd4
commit d6ce786bb7
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1893,9 +1893,16 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
#+BEGIN_SRC emacs-lisp #+BEGIN_SRC emacs-lisp
(use-package magit (use-package magit
:commands magit-status :commands magit-status
:bind (("C-x g" . magit-status)) :bind (("C-x g" . imalison:magit-status))
:preface :preface
(progn (progn
(emit-let-around imalison:magit-status-traditional
magit-status
(magit-display-buffer-function
'magit-display-buffer-traditional))
(emit-prefix-selector imalison:magit-status
magit-status
imalison:magit-status-traditional)
(defun imalison:after-magit-visit-file (&rest args) (defun imalison:after-magit-visit-file (&rest args)
(when (derived-mode-p 'org-mode) (when (derived-mode-p 'org-mode)
(org-show-context 'magit-goto)))) (org-show-context 'magit-goto))))
@ -1904,7 +1911,9 @@ I don't use auto-complete at all, so I have set up a hook to automatically disab
(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)
(defvar-setq magit-last-seen-setup-instructions "1.4.0") (setq magit-last-seen-setup-instructions "1.4.0"
magit-display-buffer-function
'magit-display-buffer-same-window-except-diff-v1)
(magit-auto-revert-mode) (magit-auto-revert-mode)
;; TODO: Is this necessary now that signing is a git default ;; TODO: Is this necessary now that signing is a git default
(when (bound-and-true-p imalison:gpg-key) (when (bound-and-true-p imalison:gpg-key)