         (prog-mode . rainbow-delimiters-mode)
         (text-mode . rainbow-delimiters-mode)))
 
-;; Show Hex Color Codes
+;; Show Hex Color Codes.
 (use-package rainbow-mode
   :commands rainbow-mode
   :diminish
   :hook (
          (web-mode . rainbow-mode)
          (css-mode . rainbow-mode)))
+
+;; Have ediff in a single frame.
+(use-package ediff
+  :commands ediff ediff-files ediff-buffers ediff-backup ediff-current-file ediff-directories ediff-revision ediff-patch-file ediff-patch-buffer ediff-merge ediff-merge-buffers-with-ancestor
+  :init
+  (setq ediff-window-setup-function 'ediff-setup-windows-plain)
+  :config
+  (setq diff-switches "-u"
+        ediff-custom-diff-options "-U3"
+        ediff-split-window-function 'split-window-horizontally
+        ediff-window-setup-function 'ediff-setup-windows-plain)
+  :hook ((ediff-startup . ediff-toggle-wide-display)
+         (ediff-cleanup . ediff-toggle-wide-display)
+         (ediff-suspend . ediff-toggle-wide-display)))
 
 ;; My personalized shortcuts:
 (global-set-key [kp-left] 'backward-sexp)

 :diminish auto-fill-function)

;; magit
;; I get errors if I defer this. Investigate.
(use-package magit
  :demand
  :bind (("C-x g" . magit-status)

;; Overwrite what is currently selected.
(delete-selection-mode 1)

;; Highlight Delimiters.
(use-package rainbow-delimiters
  :commands rainbow-delimiters-mode
  :functions color-saturate-name
