* riece-handle.el (riece-handle-nick-message): Remove nil from

channel buffers.
(riece-handle-quit-message): Ditto.
(riece-handle-kill-message): Ditto.

* riece-misc.el (riece-concat-server-name): Put 'riece-server-name
property on "(from XXX)".

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfbdbad..e61d41b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-08-15  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-handle.el (riece-handle-nick-message): Remove nil from
+       channel buffers.
+       (riece-handle-quit-message): Ditto.
+       (riece-handle-kill-message): Ditto.
+
+       * riece-misc.el (riece-concat-server-name): Put 'riece-server-name
+       property on "(from XXX)".
+
 2004-07-29  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-menu.el: Do not support enable/disable addon since

diff --git a/lisp/riece-handle.el b/lisp/riece-handle.el
index 75b88be..628d356 100644 (file)
--- a/lisp/riece-handle.el
+++ b/lisp/riece-handle.el
@@ -59,11 +59,12 @@
     (riece-naming-assert-rename old new)
     (if (riece-identity-member old-identity riece-current-channels)
        (setq channels (cons new channels)))
-    (riece-insert-change (mapcar
-                         (lambda (channel)
-                           (riece-channel-buffer (riece-make-identity
-                                                  channel riece-server-name)))
-                         channels)
+    (riece-insert-change (delq nil (mapcar
+                                   (lambda (channel)
+                                     (riece-channel-buffer
+                                      (riece-make-identity
+                                       channel riece-server-name)))
+                                   channels))
                         (format "%s -> %s\n"
                                 (riece-format-identity old-identity t)
                                 (riece-format-identity new-identity t)))
@@ -239,11 +240,11 @@
       (riece-naming-assert-part user (car pointer))
       (setq pointer (cdr pointer)))
     (let ((buffers
-          (mapcar
-           (lambda (channel)
-             (riece-channel-buffer (riece-make-identity channel
-                                                        riece-server-name)))
-           channels)))
+          (delq nil (mapcar
+                     (lambda (channel)
+                       (riece-channel-buffer (riece-make-identity
+                                              channel riece-server-name)))
+                     channels))))
       (riece-insert-change
        buffers
        (concat
@@ -282,11 +283,11 @@
       (riece-naming-assert-part user (car pointer))
       (setq pointer (cdr pointer)))
     (let ((buffers
-          (mapcar
-           (lambda (channel)
-             (riece-channel-buffer (riece-make-identity channel
-                                                        riece-server-name)))
-           channels)))
+          (delq nil (mapcar
+                     (lambda (channel)
+                       (riece-channel-buffer (riece-make-identity
+                                              channel riece-server-name)))
+                     channels))))
       (riece-insert-change
        buffers
        (concat

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 12013e4..52c44a5 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -166,7 +166,11 @@
 (defun riece-concat-server-name (string)
   (if (equal riece-server-name "")
       string
-    (concat string " (from " riece-server-name ")")))
+    (let ((server-name (concat " (from " riece-server-name ")")))
+      (put-text-property 0 (length server-name)
+                        'riece-server-name riece-server-name
+                        server-name)
+      (concat string server-name))))
 
 (defun riece-concat-user-status (status string)
   (if status