diff options
author | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
---|---|---|
committer | Tom Willemsen | 2012-12-05 00:44:09 +0100 |
commit | 6278e2e634b05027d31220afd328a9f7fe77c6f1 (patch) | |
tree | 3dbec6a3880ca980694def0d737a477b68254691 /.emacs.d/site-lisp/oni.el | |
parent | fa717d86a07d009ab324a40cd8dbf539e61a9da3 (diff) | |
parent | 15adc911da3f5b527c74b6bb67d677898d6a173e (diff) | |
download | dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.tar.gz dotfiles-6278e2e634b05027d31220afd328a9f7fe77c6f1.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 | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el index 251dca2..376c996 100644 --- a/.emacs.d/site-lisp/oni.el +++ b/.emacs.d/site-lisp/oni.el @@ -58,11 +58,9 @@ DOT are intentionally being skipped." "A mailbox map for use with `tmm-prompt'.") (defvar oni:required-packages - '(graphviz-dot-mode htmlize magit rainbow-delimiters - rainbow-mode markdown-mode flymake - flymake-cursor pony-mode sauron dispass - expand-region fill-column-indicator - git-auto-commit-mode idomenu magit smex) + '(graphviz-dot-mode htmlize magit rainbow-delimiters rainbow-mode + yasnippet markdown-mode flymake flymake-cursor sauron expand-region + fill-column-indicator git-auto-commit-mode idomenu magit smex) "List of all the packages I have (want) installed.") (defun oni:after-save-func () @@ -71,7 +69,8 @@ DOT are intentionally being skipped." (executable-make-buffer-file-executable-if-script-p) (let ((dom-dir (locate-dominating-file (buffer-file-name) "Makefile"))) (when dom-dir - (shell-command (concat "make -C " dom-dir " TAGS >/dev/null 2>&1"))))) + (shell-command + (concat "make -C " dom-dir " TAGS >/dev/null 2>&1"))))) (defun oni:before-save-func () "Function for `before-save-hook'." @@ -104,6 +103,13 @@ DOT are intentionally being skipped." (local-set-key "\C-j" 'oni:newline-and-indent) (rainbow-mode)) +(defun oni:current-jabber-status () + "Return a string representing the current jabber status." + (or (and (not *jabber-connected*) "Offline") + (and (not (string= *jabber-current-status* "")) + *jabber-current-status*) + "Online")) + (defun oni:diary-display-func () "Function for `diary-display-hook'." (diary-fancy-display)) @@ -227,7 +233,8 @@ If COUNT has been specified indent by that much, otherwise look at (visual-line-mode) (setq mode-line-format (append (cddr jabber-chat-header-line-format) '(global-mode-string)) - header-line-format nil)) + header-line-format nil + wrap-prefix (make-string 8 ?\ ))) (defun oni:jabber-roster-mode-func () "Function for `jabber-roster-mode-hook'." @@ -277,7 +284,7 @@ If COUNT has been specified indent by that much, otherwise look at to add yasnippet's expand function to hippie-expand." (require other) (add-to-list 'hippie-expand-try-functions-list - 'yas/hippie-try-expand)) + 'yas/hippie-try-expand t)) (defun oni:lua-mode-func() "Function for `lua-mode-hook'." @@ -607,6 +614,11 @@ for easy selection." "Function for `write-file-hooks'." (time-stamp)) +(defun oni:yas-minor-mode-func () + "Function for `yas-minor-mode-hook'." + (define-key yas-minor-mode-map (kbd "TAB") nil) + (define-key yas-minor-mode-map [(tab)] nil)) + (define-skeleton html-tag "Testing creation of an html tag" "Tagname:" |