summaryrefslogtreecommitdiff
path: root/init.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2016-02-14 12:42:03 -0500
committerKyle Meyer <kyle@kyleam.com>2016-02-14 12:42:03 -0500
commitfcc18caef01aed2173ad77845bcd0e3c56a7754d (patch)
tree8e58cf8393523a6c74eb47b890bdbd88716ab79c /init.el
parent2ff55eb5efb4f1a4116d92ff25cd1d71831d1c33 (diff)
downloademacs.d-fcc18caef01aed2173ad77845bcd0e3c56a7754d.tar.gz
diff: Add diff-with-other-window command
Diffstat (limited to 'init.el')
-rw-r--r--init.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/init.el b/init.el
index e7d7e99..674783d 100644
--- a/init.el
+++ b/init.el
@@ -1444,7 +1444,8 @@
(use-package km-diff
:defer t
:init
- (define-key km/external-map "o" #'km/ediff-with-other-window)
+ (define-key km/external-map "o" #'km/diff-with-other-window)
+ (define-key km/external-map "O" #'km/ediff-with-other-window)
(after 'diff-mode
(define-key diff-mode-map (kbd "C-c C-l") #'km/diff-lock-buffer)))