From ad50751c32836908e88de7e52fd15a8649e72280 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Thu, 15 Sep 2011 15:40:01 +0200
Subject: EMACS: add autosmiley to jabber

---
 .emacs.d/init.el | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to '.emacs.d/init.el')

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
-- 
cgit v1.2.3-54-g00ecf