diff options
| author |  Tom Willemsen | 2012-10-17 08:48:46 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-10-17 08:48:46 +0200 |
| commit | 821793e7deba56da5932ed42957ffefbe140ce22 (patch) | |
| tree | 5ee090c9d1e3e0793d79f5790d53141a20f12912 /.emacs.d/site-lisp | |
| parent | 862088a69158e2f8f2b6b6b7054c73bae6c40b4c (diff) | |
| parent | b74622f11bacbb696f3cba17f399b0ea77f76dbd (diff) | |
| download | dotfiles-821793e7deba56da5932ed42957ffefbe140ce22.tar.gz dotfiles-821793e7deba56da5932ed42957ffefbe140ce22.zip | |
Merge remote-tracking branch 'origin/master' into phoenix
Conflicts:
.xinitrc
Diffstat (limited to '.emacs.d/site-lisp')
| -rw-r--r-- | .emacs.d/site-lisp/oni.el | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 2338ecc..a480282 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -24,6 +24,8 @@ ;;; Code: +(autoload 'notifications-notify "notifications") + (defmacro oni:define-mailbox (name email &optional signature longname) "Define a mailbox function for mailbox NAME with address EMAIL. Optionally set signature to SIGNATURE and use LONGNAME as the @@ -57,7 +59,7 @@ DOT are intentionally being skipped." (defvar oni:required-packages '(graphviz-dot-mode htmlize magit rainbow-delimiters - rainbow-mode yasnippet markdown-mode flymake + rainbow-mode markdown-mode flymake flymake-cursor pony-mode sauron dispass expand-region fill-column-indicator git-auto-commit-mode idomenu magit smex) @@ -173,7 +175,6 @@ DOT are intentionally being skipped." (defun oni:html-mode-func () "Function for `html-mode-hook'." - (yas-minor-mode) (fci-mode)) (defun oni:indent-shift-left (start end &optional count) @@ -217,6 +218,10 @@ If COUNT has been specified indent by that much, otherwise look at (setq count tab-width)) (indent-rigidly start end count))) +(defun oni:jabber-alert-message-func (from buffer text title) + (notifications-notify :title title + :body text)) + (defun oni:jabber-chat-mode-func () "Function for `jabber-chat-mode-hook'." (visual-line-mode) @@ -373,9 +378,7 @@ When dealing with braces, add another line and indent that too." (defun oni:org-mode-func () "Function for `org-mode-hook'." - (flyspell-mode) - (auto-fill-mode) - (yas-minor-mode)) + (auto-fill-mode)) (defun oni:php-mode-func () "Function for `php-mode-hook'." @@ -390,8 +393,7 @@ When dealing with braces, add another line and indent that too." "Function for `prog-mode-hook'." (rainbow-delimiters-mode) (fci-mode) - (pretty-symbols-mode) - (yas-minor-mode)) + (pretty-symbols-mode)) (defun oni:python-mode-func () "Function for `python-mode-hook'." @@ -547,9 +549,5 @@ for easy selection." "Function for `write-file-hooks'." (time-stamp)) -(defun oni:yas-minor-mode-func () - "Function for `yas-minor-mode-hook'." - (yas-load-directory (car yas-snippet-dirs))) - (provide 'oni) ;;; oni.el ends here |