jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
# 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-10-19 14:48:53 +03:00
parent 46d39475de 93c2098e36
commit 11772f6612
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
prelude/prelude-editor.el
View file

@ -205,8 +205,8 @@
;; load yasnippet ;; load yasnippet
(require 'yasnippet) (require 'yasnippet)
(add-to-list 'yas/snippet-dirs prelude-snippets-dir) (add-to-list 'yas-snippet-dirs prelude-snippets-dir)
(yas/global-mode 1) (yas-global-mode 1)
;; projectile is a project management mode ;; projectile is a project management mode
(require 'projectile) (require 'projectile)