Add all buffer search, add evil-ediff

emacs.d/init.el

@@ -87,6 +87,11 @@ scroll-step 1)
 ;; remember cursor position
 (toggle-save-place-globally)
 
+;; Search all buffers
+(defun grep-search-all-buffers (regexp)
+  (interactive "sRegexp: ")
+  (multi-occur-in-matching-buffers "." regexp t))
+
 ;;; Spelling
 
 ;; map ]s and [s to next and previously wrong word

emacs.d/packages/packages.el

@@ -77,6 +77,7 @@
 	diminish
 	dtrt-indent
 	undohist
+	evil-ediff
 	))
 
 ;; List of optional packages
@@ -384,4 +385,8 @@
   (setq haskell-interactive-popup-errors nil)
   (define-key haskell-mode-map (kbd "C-c C-c") 'inferior-haskell-load-file))
 
+(use-package evil-ediff
+  :config
+  (add-hook 'ediff-load-hook 'evil-ediff-init))
+
 (provide 'packages)