Merge remote-tracking branch 'origin/master' into phoenix

Conflicts:
	dotfiles.mk

1 files changed, 9 insertions, 2 deletions

diff --git a/.emacs.d/site-lisp/oni.el b/.emacs.d/site-lisp/oni.el
index 376c996..b3a7987 100644
--- a/.emacs.d/site-lisp/oni.el
+++ b/.emacs.d/site-lisp/oni.el
@@ -25,6 +25,7 @@
 ;;; Code:
 
 (autoload 'notifications-notify "notifications")
+(autoload 'jabber-send-message "jabber-chat")
 
 (defmacro oni:define-mailbox (name email &optional signature longname)
   "Define a mailbox function for mailbox NAME with address EMAIL.
@@ -72,6 +73,13 @@ DOT are intentionally being skipped."
       (shell-command
        (concat "make -C " dom-dir " TAGS >/dev/null 2>&1")))))
 
+(defun oni:appt-display-window-and-jabber (min-to-app new-time appt-msg)
+  "Send a message to my phone jabber account."
+  (jabber-send-message (car jabber-connections) "phone@ryuslash.org"
+                       nil (format "%s%s (in %s minutes)"
+                                   new-time appt-msg min-to-app) nil)
+  (appt-disp-window min-to-app new-time appt-msg))
+
 (defun oni:before-save-func ()
   "Function for `before-save-hook'."
   (if (eq major-mode 'html-mode)
@@ -233,8 +241,7 @@ 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
-        wrap-prefix (make-string 8 ?\ )))
+        header-line-format nil))
 
 (defun oni:jabber-roster-mode-func ()
   "Function for `jabber-roster-mode-hook'."