X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-300.el;h=4ec44e81d12ee9c0dc47dd77112ea03be2deacef;hp=4d8b1b0db16158259a3a77ed4b624f56e0c16b47;hb=a4172314ca68caab7e2cef48323d0e296141b18d;hpb=9d7587e2c6a942733e08a3a2fae9257a7e4549b1

diff --git a/lisp/riece-300.el b/lisp/riece-300.el
index 4d8b1b0..4ec44e8 100644
--- a/lisp/riece-300.el
+++ b/lisp/riece-300.el
@@ -25,7 +25,6 @@
 ;;; Code:
 
 (require 'riece-misc)
-(require 'riece-commands)
 
 (require 'riece-filter)			;riece-default-handle-message
 
@@ -248,7 +247,7 @@
 	(riece-channel-set-topic (riece-get-channel channel) topic)
 	(let* ((channel-identity (riece-make-identity channel
 						      riece-server-name))
-	       (buffer (riece-channel-buffer-name channel-identity)))
+	       (buffer (riece-channel-buffer channel-identity)))
 	  (riece-insert-info buffer (concat visible " users, topic: "
 					    topic "\n"))
 	  (riece-insert-info
@@ -258,8 +257,8 @@
 	     riece-dialogue-buffer)
 	   (concat
 	    (riece-concat-server-name
-	     (format "%s users on %s, topic: %s" visible
-		     (riece-format-identity channel-identity t) topic))
+	     (format "%s: %s users, topic: %s"
+		     (riece-format-identity channel-identity t) visible topic))
 	    "\n"))))))
 
 (defun riece-handle-324-message (prefix number name string)
@@ -274,7 +273,7 @@
 	  (setq modes (cdr modes)))
 	(let* ((channel-identity (riece-make-identity channel
 						      riece-server-name))
-	       (buffer (riece-channel-buffer-name channel-identity)))
+	       (buffer (riece-channel-buffer channel-identity)))
 	  (riece-insert-info buffer (concat "Mode: " mode-string "\n"))
 	  (riece-insert-info
 	   (if (and riece-channel-buffer-mode
@@ -295,7 +294,7 @@
       (let* ((channel (match-string 1 string))
 	     (message (substring string (match-end 0)))
 	     (channel-identity (riece-make-identity channel riece-server-name))
-	     (buffer (riece-channel-buffer-name channel-identity)))
+	     (buffer (riece-channel-buffer channel-identity)))
 	(if remove
 	    (riece-channel-set-topic (riece-get-channel channel) nil)
 	  (riece-channel-set-topic (riece-get-channel channel) message)
@@ -324,7 +323,7 @@
       (let* ((channel (match-string 1 string))
 	     (user (substring string (match-end 0)))
 	     (channel-identity (riece-make-identity channel riece-server-name))
-	     (buffer (riece-channel-buffer-name channel-identity)))
+	     (buffer (riece-channel-buffer channel-identity)))
 	(riece-insert-info buffer (concat "Inviting " user "\n"))
 	(riece-insert-info
 	 (if (and riece-channel-buffer-mode
@@ -349,8 +348,8 @@
 	     (flag (match-string 8 string))
 	     (hops (match-string 9 string))
 	     (name (substring string (match-end 0)))
-	     (buffer (riece-channel-buffer-name
-		      (riece-make-identity channel riece-server-name)))
+	     (buffer (riece-channel-buffer (riece-make-identity
+					    channel riece-server-name)))
 	     (info (format "%10s = %s (%s) [%s, %s, %s hops, on %s]"
 			   (concat
 			    (if (memq flag '(?@ ?+))