X-Git-Url: https://git.shemshak.org/gitweb.cgi/~bandali/configs/blobdiff_plain/435306f68d07a5e26da738b65d0dad57e62456c0..0af1e91a41552561fc54cf23c6fd6a84a28b4f1e:/.emacs.d/init.el?ds=sidebyside

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index fe4b180..87199e9 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -444,6 +444,14 @@ For disabling the behaviour for certain buffers and/or modes."
 ;; allow scrolling in Isearch
 (setq isearch-allow-scroll t)
 
+(use-feature vc
+  :bind ("C-x v C-=" . vc-ediff))
+
+(use-feature ediff
+  :config (add-hook 'ediff-after-quit-hook-internal 'winner-undo)
+  :custom ((ediff-window-setup-function 'ediff-setup-windows-plain)
+           (ediff-split-window-function 'split-window-horizontally)))
+
 
 ;;; General bindings
 
@@ -1377,9 +1385,7 @@ For disabling the behaviour for certain buffers and/or modes."
          ("C-c a s m p" . multi-term-prev)
          ("C-c a s m n" . multi-term-next)
          :map term-mode-map
-         ("C-c C-j" . term-char-mode)
-         :map term-raw-map
-         ("C-c C-j" . term-line-mode))
+         ("C-c C-j" . term-char-mode))
   :config
   (setq multi-term-program "screen"
         multi-term-program-switches (concat "-c"
@@ -1393,6 +1399,7 @@ For disabling the behaviour for certain buffers and/or modes."
         term-bind-key-alist
         '(("C-c C-c" . term-interrupt-subjob)
           ("C-c C-e" . term-send-esc)
+          ("C-c C-j" . term-line-mode)
           ("C-k" . kill-line)
           ;; ("C-y" . term-paste)
           ("C-y" . term-send-raw)