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 2012-12-23 09:54:59 +02:00
commit 61f53e6d06

View file

@ -50,7 +50,7 @@ by Prelude.")
ELPA (or MELPA).") ELPA (or MELPA).")
(defvar prelude-snippets-dir (expand-file-name "snippets" prelude-dir) (defvar prelude-snippets-dir (expand-file-name "snippets" prelude-dir)
"This folder houses additional yasnippet bundles distributed with Prelude.") "This folder houses additional yasnippet bundles distributed with Prelude.")
(defvar prelude-personal-snippets-dir (expand-file-name prelude-personal-dir "snippets") (defvar prelude-personal-snippets-dir (expand-file-name "snippets" prelude-personal-dir)
"This folder houses additional yasnippet bundles added by the users.") "This folder houses additional yasnippet bundles added by the users.")
(defvar prelude-savefile-dir (expand-file-name "savefile" prelude-dir) (defvar prelude-savefile-dir (expand-file-name "savefile" prelude-dir)
"This folder stores all the automatically generated save/history-files.") "This folder stores all the automatically generated save/history-files.")