diff options
| author |  Tom Willemsen | 2012-10-26 01:46:09 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-26 01:46:09 +0200 |
| commit | cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9 (patch) | |
| tree | 5c0040ca1c8e8ea10f0c8b4d647d579d72c4bc18 /.emacs.d/site-lisp/oni.el | |
| parent | d6be1ae80fb59495c6bb72b5b6248b5c9a08b4c7 (diff) | |
| parent | 2e70340b951f485d45b95684e7910d1a78917d03 (diff) | |
| download | dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.tar.gz dotfiles-cbdfa4cac317cbde73da1bbbc4bae37c6617f5d9.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.emacs.d/site-lisp/oni.el
Diffstat (limited to '.emacs.d/site-lisp/oni.el')
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 35e85dc..9b02dc1 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -379,7 +379,9 @@ When dealing with braces, add another line and indent that too." (defun oni:org-mode-func () "Function for `org-mode-hook'." - (auto-fill-mode)) + (auto-fill-mode) + (yas-minor-mode) + (setq-local comment-auto-fill-only-comments nil)) (defun oni:php-mode-func () "Function for `php-mode-hook'." |