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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Bozhidar Batsov 2013-03-27 12:13:46 +02:00
commit d24e5ed664

View file

@ -34,7 +34,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-ensure-module-deps 'exec-path-from-shell) (prelude-ensure-module-deps '(exec-path-from-shell))
(require 'exec-path-from-shell) (require 'exec-path-from-shell)
(exec-path-from-shell-initialize) (exec-path-from-shell-initialize)