* riece-channel.el (riece-forget-channel): Fixed.

(riece-channel-modeless-regexp): Abolish.
(riece-channel-modeless-p): Abolish.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c53e848..b3ee2d1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-06-06  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-channel.el (riece-forget-channel): Fixed.
+       (riece-channel-modeless-regexp): Abolish.
+       (riece-channel-modeless-p): Abolish.
+
 2003-06-06  OHASHI Akira  <bg66@koka-in.org>
 
        * riece-unread.el (riece-unread-display-message-function): Delete the

diff --git a/lisp/riece-channel.el b/lisp/riece-channel.el
index 7895d8b..5e9971a 100644 (file)
--- a/lisp/riece-channel.el
+++ b/lisp/riece-channel.el
@@ -29,18 +29,12 @@
 
 ;;; String representation of a channel:
 (defconst riece-channel-regexp "^[+&#!]")
-(defconst riece-channel-modeless-regexp "^[+!]")
 
 (defun riece-channel-p (string)
   "Return t if STRING is a channel.
 \(i.e. it matches `riece-channel-regexp')"
   (string-match riece-channel-regexp string))
 
-(defun riece-channel-modeless-p (string)
-  "Return t if STRING is a modeless channel.
-\(i.e. it matches `riece-channel-modeless-regexp')"
-  (string-match riece-channel-modeless-regexp string))
-
 ;;; Channel object:
 (defun riece-find-channel (name)
   "Get a channel object named NAME from the server buffer."
@@ -54,7 +48,8 @@
 (defun riece-forget-channel (name)
   (riece-with-server-buffer
    (let ((symbol (intern-soft (riece-identity-canonicalize-prefix
-                              (riece-identity-prefix name)))))
+                              (riece-identity-prefix name))
+                             riece-obarray)))
      (when symbol
        (makunbound symbol)
        (unintern (symbol-name symbol) riece-obarray)))))