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

Conflicts:
	core/prelude-editor.el
This commit is contained in:
Bozhidar Batsov 2014-04-14 17:41:16 +03:00
commit 244fe33296
3 changed files with 6 additions and 0 deletions

View file

@ -380,6 +380,10 @@ indent yanked text (with prefix arg don't indent)."
(global-diff-hl-mode +1) (global-diff-hl-mode +1)
(add-hook 'dired-mode-hook 'diff-hl-dired-mode) (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) (provide 'prelude-editor)
;;; prelude-editor.el ends here ;;; prelude-editor.el ends here

View file

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

View file

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