* riece-misc.el (riece-concat-channel-topic): Don't append ":" if

topic is "".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b367f85..ef4f67b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2003-08-25  Daiki Ueno  <ueno@unixuser.org>
 
 2003-08-25  Daiki Ueno  <ueno@unixuser.org>
 

+       * riece-misc.el (riece-concat-channel-topic): Don't append ":" if
+       topic is "".
+

        * riece-300.el (riece-handle-322-message): Simplify message.
 
        * riece-commands.el (riece-command-change-layout): Call
        * riece-300.el (riece-handle-322-message): Simplify message.
 
        * riece-commands.el (riece-command-change-layout): Call

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 2ba5785..60a02c0 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -108,9 +108,10 @@
 (defun riece-concat-channel-topic (target string)
   (riece-with-server-buffer (riece-identity-server target)
     (let ((topic (riece-channel-get-topic (riece-identity-prefix target))))
 (defun riece-concat-channel-topic (target string)
   (riece-with-server-buffer (riece-identity-server target)
     (let ((topic (riece-channel-get-topic (riece-identity-prefix target))))

-      (if topic
-         (concat string ": " topic)
-       string))))
+      (if (or (null topic)
+             (equal topic ""))
+         string
+       (concat string ": " topic)))))

 
 (defun riece-concat-channel-modes (target string)
   (riece-with-server-buffer (riece-identity-server target)
 
 (defun riece-concat-channel-modes (target string)
   (riece-with-server-buffer (riece-identity-server target)