Emacs: disable electric pairs, failproof ediff for git merge

.emacs.d/lisp/main.el

@@ -215,8 +215,8 @@
 ;; (setq semanticdb-find-default-throttle '(project unloaded system recursive))
 
 ;; Electric Pairs to auto-complete () [] {} "" etc. You can use it on regions.
-(if (>= emacs-major-version 24)
-    (electric-pair-mode 1))
+;; (if (>= emacs-major-version 24)
+;;     (electric-pair-mode 1))
 
 ;; Run ranger asynchronously.
 (define-key my-keys-minor-mode-map (kbd "C-x D")

.emacs.d/lisp/mode-sh.el

@@ -46,7 +46,10 @@ The advantages of this function over the vanilla code are:
   ; (setq sh-shell-file (executable-find (symbol-name sh-shell)))
   ;; Convenient version.
   (setq sh-shell-file (concat "/bin/" (symbol-name sh-shell)))
-  (set (make-local-variable 'compile-command) (concat sh-shell-file " " (shell-quote-argument buffer-file-name))))
+  ;; `buffer-file-name` seems to have a non-string type sometimes With `git
+  ;; merge` and cause ediff to fail. Let's protect it.
+  (when (stringp buffer-file-name)
+    (set (make-local-variable 'compile-command) (concat sh-shell-file " " (shell-quote-argument buffer-file-name)))))
 
 ;; sh-set-shell partly resets some of the font-lock config. We use this
 ;; workaround to restore it.

.emacs.d/lisp/theme.el

@@ -128,11 +128,11 @@
    (set-face-background 'ediff-even-diff-C "#303030")
    (set-face-foreground 'ediff-even-diff-C nil)
 
-   (set-face-background 'ediff-odd-diff-A "brightblack")
+   (set-face-background 'ediff-odd-diff-A "#696969")
    (set-face-foreground 'ediff-odd-diff-A nil)
-   (set-face-background 'ediff-odd-diff-B "brightblack")
+   (set-face-background 'ediff-odd-diff-B "#696969")
    (set-face-foreground 'ediff-odd-diff-B nil)
-   (set-face-background 'ediff-odd-diff-C "brightblack")
+   (set-face-background 'ediff-odd-diff-C "#696969")
    (set-face-foreground 'ediff-odd-diff-C nil)))
 
 ;; Show paren.