Mercurial Mercurial > dot-emacs / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:///E:\srv\hg\dot-emacs
authorOleksandr Gavenko <gavenkoa@gmail.com>
Thu, 17 Dec 2009 22:47:31 +0200
changeset 220 a1004ec442f3
parent 215 404b444d990b (diff)
parent 219 b67d7266eae4 (current diff)
child 221 e7d927423ff7
Automated merge with file:///E:\srv\hg\dot-emacs
.emacs-my file | annotate | diff | comparison | revisions 
--- a/.emacs-my	Thu Dec 17 22:47:27 2009 +0200
+++ b/.emacs-my	Thu Dec 17 22:47:31 2009 +0200
@@ -668,12 +668,23 @@
 ;; ----------------------------------------------------------------------
 ;; jabber
 (when (featurep 'jabber)
-    (setq jabber-history-enabled t
-          jabber-use-global-history nil
-          jabber-backlog-number 15
-          jabber-backlog-days 30
-          jabber-alert-presence-message-function (lambda (who oldstatus newstatus statustext) nil)
-          )
+  (setq
+   jabber-history-enabled t
+   jabber-use-global-history nil
+   jabber-backlog-number 15
+   jabber-backlog-days 30
+   jabber-alert-presence-message-function (lambda (who oldstatus newstatus statustext) nil)
+   )
+  )
+
+(setq my-chat-prompt "[%t] %n>\n")
+(when (featurep 'jabber)
+  (setq
+   jabber-chat-foreign-prompt-format my-chat-prompt
+   jabber-chat-local-prompt-format my-chat-prompt
+   jabber-groupchat-prompt-format my-chat-prompt
+   jabber-muc-private-foreign-prompt-format "[%t] %g/%n>\n"
+   )
   )
 
 ;; fsm used in emacs jabber
dot-emacs