Merge branch 'master' of github.com:bbatsov/prelude

Conflicts:
	core/prelude-editor.el

core/prelude-editor.el

@@ -380,6 +380,10 @@ indent yanked text (with prefix arg don't indent)."
 (global-diff-hl-mode +1)
 (add-hook 'dired-mode-hook 'diff-hl-dired-mode)
 
+;; easy-kill
+(global-set-key [remap kill-ring-save] 'easy-kill)
+(global-set-key [remap mark-sexp] 'easy-mark)
+
 (provide 'prelude-editor)
 
 ;;; prelude-editor.el ends here

core/prelude-osx.el

@@ -35,6 +35,7 @@
 ;; On OS X Emacs doesn't use the shell PATH if it's not started from
 ;; the shell. Let's fix that:
 (prelude-require-packages '(exec-path-from-shell))
+
 (require 'exec-path-from-shell)
 (exec-path-from-shell-initialize)
 

core/prelude-packages.el

@@ -50,6 +50,7 @@
     dash
     diff-hl
     diminish
+    easy-kill
     elisp-slime-nav
     epl
     expand-region