diff --git a/core/prelude-osx.el b/core/prelude-osx.el index c502e06..f7879c8 100644 --- a/core/prelude-osx.el +++ b/core/prelude-osx.el @@ -1,5 +1,41 @@ +;;; prelude-osx.el --- Emacs Prelude: OSX specific settings. +;; +;; Copyright © 2011-2013 Bozhidar Batsov +;; +;; Author: Bozhidar Batsov +;; URL: https://github.com/bbatsov/prelude +;; Version: 1.0.0 +;; Keywords: convenience + +;; This file is not part of GNU Emacs. + +;;; Commentary: + +;; Some OSX specific stuff. + +;;; License: + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License +;; as published by the Free Software Foundation; either version 3 +;; of the License, or (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Code: + ;; On OS X Emacs doesn't use the shell PATH if it's not started from ;; the shell. Let's fix that: +(prelude-ensure-module-deps 'exec-path-from-shell) +(require 'exec-path-from-shell) (exec-path-from-shell-initialize) ;; It's all in the Meta @@ -25,3 +61,4 @@ with a Windows external keyboard from time to time." (menu-bar-mode +1) (provide 'prelude-osx) +;;; prelude-osx.el ends here diff --git a/core/prelude-packages.el b/core/prelude-packages.el index 0fa4b55..76d7cc8 100644 --- a/core/prelude-packages.el +++ b/core/prelude-packages.el @@ -40,7 +40,7 @@ (package-initialize) (defvar prelude-packages - '(ace-jump-mode ack-and-a-half diminish elisp-slime-nav exec-path-from-shell + '(ace-jump-mode ack-and-a-half diminish elisp-slime-nav expand-region flycheck gist git-commit-mode gitconfig-mode gitignore-mode guru-mode helm helm-projectile diff --git a/init.el b/init.el index dd92066..637f321 100644 --- a/init.el +++ b/init.el @@ -66,8 +66,8 @@ by Prelude.") (dolist (f (directory-files parent-dir)) (let ((name (expand-file-name f parent-dir))) (when (and (file-directory-p name) - (not (equal f "..")) - (not (equal f "."))) + (not (equal f "..")) + (not (equal f "."))) (add-to-list 'load-path name))))) ;; add Prelude's directories to Emacs's `load-path'