summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-09-15 15:40:01 +0200
committerGravatar Tom Willemsen2011-09-15 15:40:01 +0200
commitad50751c32836908e88de7e52fd15a8649e72280 (patch)
tree568d6a57272152d8e07b8b707b94d7a5598aef62 /.emacs.d/init.el
parent3d46033e3d481ace43585e8c7ee6971390ef1a3c (diff)
downloaddotfiles-ad50751c32836908e88de7e52fd15a8649e72280.tar.gz
dotfiles-ad50751c32836908e88de7e52fd15a8649e72280.zip
EMACS: add autosmiley to jabber
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el18
1 files changed, 13 insertions, 5 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 8791fe1..23d68f8 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -316,12 +316,20 @@
;;-----[ Gnus ]----------------------------------------------------------
(setq gnus-init-file "~/.emacs.d/gnus")
+;;-----[ Autosmiley ]----------------------------------------------------
+(require 'autosmiley)
+
;;-----[ Jabber ]--------------------------------------------------------
-(require 'jabber-autoloads)
-(setq jabber-account-list
- '(("ryuslash@gmail.com"
- (:network-server . "talk.google.com")
- (:connection-type . ssl))))
+(when (require 'jabber-autoloads nil 'noerror)
+ (setq jabber-account-list
+ '(("ryuslash@gmail.com"
+ (:network-server . "talk.google.com")
+ (:connection-type . ssl))))
+ (setq jabber-history-enabled t)
+ (setq jabber-use-global-history nil)
+ (define-key jabber-chat-mode-map [S-return] 'newline)
+ (define-key jabber-chat-mode-map [C-return] 'newline)
+ (add-hook 'jabber-chat-mode-hook 'autosmiley-mode))
;;-----[ X11 ]-----------------------------------------------------------
(when window-system