diff options
| author |  Tom Willemsen | 2013-03-22 13:33:59 +0100 |
|---|---|---|
| committer | Tom Willemsen | 2013-03-22 13:33:59 +0100 |
| commit | a5c9f6c9c3338a90d0bd11a6d13ee8724503d4fd (patch) | |
| tree | 3a74c5d67059ddc939ab450e8d9e34cfa91f6aaa | |
| parent | e28ba29d84492ff065c70fe003f517cbc326dc25 (diff) | |
| download | dotfiles-a5c9f6c9c3338a90d0bd11a6d13ee8724503d4fd.tar.gz dotfiles-a5c9f6c9c3338a90d0bd11a6d13ee8724503d4fd.zip | |
Emacs: Move some more jabber settings to org
| -rw-r--r-- | emacs/init.el | 4 | ||||
| -rw-r--r-- | emacs/init.org | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/emacs/init.el b/emacs/init.el index 66e37d4..fa5a93b 100644 --- a/emacs/init.el +++ b/emacs/init.el @@ -23,7 +23,6 @@ "Face for the supposedly empty line in commit messages." :group 'local) -(eval-after-load "jabber" '(oni:jabber-init)) (eval-after-load "newst-treeview" '(require 'newsticker-init)) (eval-after-load "org" '(require 'org-init)) (eval-after-load "rainbow-mode" '(oni:rainbow-mode-init)) @@ -102,9 +101,6 @@ (setq inhibit-startup-message t) (setq initial-major-mode 'emacs-lisp-mode) (setq initial-scratch-message nil) -(setq jabber-account-list '(("ryuslash@jabber.org") - ("tom@ryuslash.org/drd" - (:connection-type . ssl)))) (setq jabber-avatar-cache-directory "~/.emacs.d/jabber-avatars/") (setq jabber-chat-buffer-format "*jab:%n*") (setq jabber-chat-buffer-show-avatar nil) diff --git a/emacs/init.org b/emacs/init.org index 5394f5e..7fc6a8d 100644 --- a/emacs/init.org +++ b/emacs/init.org @@ -487,6 +487,16 @@ * jabber + Don't echo presence updates in the message area. + + #+BEGIN_SRC emacs-lisp + (defun oni:jabber-init () + "Initialization function for jabber." + (remove-hook 'jabber-alert-presence-hooks 'jabber-presence-echo)) + + (eval-after-load "jabber" '(oni:jabber-init)) + #+END_SRC + Require ~jabber-libnotify~ so we can use its alert functions. #+BEGIN_SRC emacs-lisp @@ -517,6 +527,14 @@ jabber-history-dir "~/.emacs.d/jabber-hist") #+END_SRC + Add some accounts. + + #+BEGIN_SRC emacs-lisp + (setq jabber-account-list '(("ryuslash@jabber.org") + ("tom@ryuslash.org/drd" + (:connection-type . ssl)))) + #+END_SRC + * ido Keep some buffers from showing up when using ido-mode. Either these |