summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-09-16 22:32:35 -0400
committerKyle Meyer <kyle@kyleam.com>2014-09-16 22:32:35 -0400
commit0ae0439864e802b402d8d89fc16a566418adae11 (patch)
tree3bbbd58703c9330a78bdef3ecd3205b2e70c84f8 /lisp
parentaa3d229db62fdf7a60fc315834aa689311feda6b (diff)
downloademacs.d-0ae0439864e802b402d8d89fc16a566418adae11.tar.gz
Unbind magit-add-change-log-entry-other-window
Diffstat (limited to 'lisp')
-rw-r--r--lisp/init-git.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 7402042..0ae7034 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -88,6 +88,9 @@ START-POINT set to the current branch.
(define-key magit-popup-mode-map (kbd "SPC SPC <t>") 'magit-invoke-popup-option)
(define-key magit-mode-map (kbd "C-c m") 'km/magit-prefix-map)
+ ;; Remove `magit-add-change-log-entry-other-window', which overrides
+ ;; my binding for `km/zsh-ansi-term-other-window'.
+ (define-key magit-mode-map (kbd "C-x 4 a") nil)
(magit-define-popup-action 'magit-commit-popup
?u "Auto commit" 'km/magit-auto-commit)