Synch up with the trunk.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9449b39..2639d1f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
+2003-06-06  OHASHI Akira  <bg66@koka-in.org>
+
+       * riece-ndcc.el (riece-ndcc-server-sentinel): Close a parenthesis.
+
+       * riece-rdcc.el (riece-rdcc-insinuate): Don't use the 3rd argument of
+       `add-to-list'.
+
+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
+       target before adding to list.
+       (riece-unread-switch-to-channel): New function.
+       (riece-unread-insinuate): Bind "\C-c\C-u" to riece-command-mode-map.
+       Bind "u" to riece-dialogue-mode-map.
+       Bind "u" to riece-channel-list-mode-map.
+
+       * riece.el (riece-channel-list-mode-map): Don't bind
+       `riece-command-unread-channel'.
+
 2003-06-04  Yoichi NAKAYAMA  <yoichi@geiin.org>
 
        * riece-000.el,riece-200.el,riece-300.el,riece-400.el,riece-500.el,

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)))))

diff --git a/lisp/riece-ndcc.el b/lisp/riece-ndcc.el
index 78a73d7..ca9244c 100644 (file)
--- a/lisp/riece-ndcc.el
+++ b/lisp/riece-ndcc.el
@@ -81,7 +81,7 @@ Only used for sending files."
        (message "Sending %s...done"
                 (buffer-file-name)))
       (kill-buffer (process-buffer (get-process parent-name))))
-    (kill-buffer (process-buffer process))
+    (kill-buffer (process-buffer process))))
 
 (defun riece-command-dcc-send (user file)
   (interactive

diff --git a/lisp/riece-rdcc.el b/lisp/riece-rdcc.el
index e02b587..5b4e891 100644 (file)
--- a/lisp/riece-rdcc.el
+++ b/lisp/riece-rdcc.el
@@ -293,7 +293,7 @@ puts(\"#{" address " >> 24 & 0xFF}.#{" address " >> 16 & 0xFF}.#{"
 
 (defvar riece-dialogue-mode-map)
 (defun riece-rdcc-insinuate ()
-  (add-to-list 'riece-ctcp-additional-clientinfo "DCC" t)
+  (add-to-list 'riece-ctcp-additional-clientinfo "DCC")
   (add-hook 'riece-ctcp-dcc-request-hook 'riece-handle-dcc-request)
   (define-key riece-dialogue-mode-map "\C-ds" 'riece-command-dcc-send)
   (define-key riece-dialogue-mode-map "\C-dr" 'riece-command-dcc-receive))

diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el
index 5c7ad7f..d2e3100 100644 (file)
--- a/lisp/riece-unread.el
+++ b/lisp/riece-unread.el
@@ -38,6 +38,8 @@
 (defun riece-unread-display-message-function (message)
   (unless (or (riece-message-own-p message)
              (equal (riece-message-target message) riece-current-channel))
+    (setq riece-unread-channels
+         (delete (riece-message-target message) riece-unread-channels))
     (add-to-list 'riece-unread-channels
                 (riece-message-target message))
     (riece-unread-update-channel-list-buffer)))
@@ -66,13 +68,29 @@
                           "\\3"))))
            (forward-line))))))
       
+(defun riece-unread-switch-to-channel ()
+  (interactive)
+  (if (car riece-unread-channels)
+      (riece-command-switch-to-channel (car riece-unread-channels))
+    (error "No unread channel!")))
+
+(defvar riece-command-mode-map)
+(defvar riece-dialogue-mode-map)
+(defvar riece-channel-list-mode-map)
+
 (defun riece-unread-insinuate ()
   (add-hook 'riece-after-display-message-functions
            'riece-unread-display-message-function)
   (add-hook 'riece-channel-switch-hook
            'riece-unread-channel-switch-hook)
   (add-hook 'riece-update-buffers-hook
-           'riece-unread-update-channel-list-buffer))
+           'riece-unread-update-channel-list-buffer)
+  (define-key riece-command-mode-map
+    "\C-c\C-u" 'riece-unread-switch-to-channel)
+  (define-key riece-dialogue-mode-map
+    "u" 'riece-unread-switch-to-channel)
+  (define-key riece-channel-list-mode-map
+    "u" 'riece-unread-switch-to-channel))
 
 (provide 'riece-unread)
 

diff --git a/lisp/riece.el b/lisp/riece.el
index e0746b1..11303ef 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -197,7 +197,6 @@ If optional argument SAFE is nil, overwrite previous definitions."
   (riece-define-keys riece-channel-list-mode-map
     ">" riece-command-next-channel
     "<" riece-command-previous-channel
-    "u" riece-command-unread-channel
     "o" other-window
     "c" riece-command-select-command-buffer)