Update of /cvsroot/emacs-jabber/emacs-jabber
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv6882
Modified Files:
jabber-muc.el
Log Message:
Revision: ma...@fr...--2005/emacs-jabber--cvs-head--0--patch-524
Creator: Magnus Henoch <ma...@fr...>
Undo miscommitted change
Index: jabber-muc.el
===================================================================
RCS file: /cvsroot/emacs-jabber/emacs-jabber/jabber-muc.el,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- jabber-muc.el 9 Jun 2008 22:47:48 -0000 1.76
+++ jabber-muc.el 9 Jun 2008 22:48:02 -0000 1.77
@@ -884,28 +884,21 @@
;; error from room itself? or are we leaving?
(if (or (null nickname)
(string= nickname (gethash (jabber-jid-symbol group) jabber-pending-groupchats)))
- ;; Assume that an error means that we were thrown out of the
- ;; room...
- (let* ((leavingp t)
- (message (cond
- ((string= type "error")
- (cond
- ;; ...except for certain cases.
- ((equal status-code "406")
- ;; XXX: were we already in the room?
- (concat "Error entering room"
- (when error-node
- (concat ": " (jabber-parse-error error-node)))))
- ((equal status-code "301")
- (concat "You have been banned"
- (when actor (concat " by " actor))
- (when reason (concat " - '" reason "'"))))
- ((equal status-code "307")
- (concat "You have been kicked"
- (when actor (concat " by " actor))
- (when reason (concat " - '" reason "'"))))
- (t
- "You have left the chatroom"))))
+ (let ((message (cond
+ ((string= type "error")
+ (concat "Error entering room"
+ (when error-node
+ (concat ": " (jabber-parse-error error-node)))))
+ ((equal status-code "301")
+ (concat "You have been banned"
+ (when actor (concat " by " actor))
+ (when reason (concat " - '" reason "'"))))
+ ((equal status-code "307")
+ (concat "You have been kicked"
+ (when actor (concat " by " actor))
+ (when reason (concat " - '" reason "'"))))
+ (t
+ "You have left the chatroom"))))
(jabber-muc-remove-groupchat group)
;; If there is no buffer for this groupchat, don't bother
;; creating one just to tell that user left the room.
|
