magit-ediff 2way + term

Author: inlinechan

el-get-init-files/init-magit.el

@@ -4,6 +4,10 @@
 (require 'magit)
 (global-set-key (kbd "C-c s") 'magit-status)
 
+;; https://github.com/magit/magit/issues/1743
+;; use 2way ediff like we used to do in version 1.x
+(setq magit-ediff-dwim-show-on-hunks t)
+
 (eval-after-load 'magit
   (when (and (not window-system) (string-match "1\\.4*" (magit-version)))
     (set-face-background 'magit-log-head-label-tags "Grey85")))

hc/hc-general-key.el

@@ -27,4 +27,6 @@
 ;; Minimize current buffer's height
 (global-set-key [f7] (kbd "C-x + C-u - 1 6 C-x ^"))
 
+(global-set-key (kbd "<f3>") 'term)
+
 (provide 'hc-general-key)

hc/hc-general.el

@@ -445,4 +445,23 @@ vi style of % jumping to matching brace."
     (add-to-list 'load-path org-jekyll-publish-path)
     (require 'org-jekyll-publish nil t)))
 
+;; If non-nil, Dired tries to guess a default target directory. AWESOME
+;; (setq dired-dwim-target t)
+
+;; http://joelmccracken.github.io/entries/switching-between-term-mode-and-line-mode-in-emacs-term/
+(require 'term)
+
+(defun jnm/term-toggle-mode ()
+  "Toggles term between line mode and char mode"
+  (interactive)
+  (if (term-in-line-mode)
+      (term-char-mode)
+    (term-line-mode)))
+
+(define-key term-mode-map (kbd "C-c C-j") 'jnm/term-toggle-mode)
+(define-key term-mode-map (kbd "C-c C-k") 'jnm/term-toggle-mode)
+
+(define-key term-raw-map (kbd "C-c C-j") 'jnm/term-toggle-mode)
+(define-key term-raw-map (kbd "C-c C-k") 'jnm/term-toggle-mode)
+
 (provide 'hc-general)