* riece-unread.el (riece-modeline-unread-face): New face;

setup the properties are inherited from 'modeline.
* riece-history.el (riece-modeline-history-face): New face;
setup the properties are inherited from 'modeline.
* riece-highlight.el (riece-modeline-current-face): New face;
setup the properties are inherited from 'modeline.

* riece-server.el (riece-close-server-process): Reset
process-filter/process-sentinel.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6239c0..b937469 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2004-06-01  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-unread.el (riece-modeline-unread-face): New face;
+       setup the properties are inherited from 'modeline.
+       * riece-history.el (riece-modeline-history-face): New face;
+       setup the properties are inherited from 'modeline.
+       * riece-highlight.el (riece-modeline-current-face): New face;
+       setup the properties are inherited from 'modeline.
+
+       * riece-server.el (riece-close-server-process): Reset
+       process-filter/process-sentinel.
+

 2004-05-31  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-hangman.el (riece-hangman-after-privmsg-hook): Display answer.
 2004-05-31  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-hangman.el (riece-hangman-after-privmsg-hook): Display answer.

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index ca9baef..513011e 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -189,6 +189,14 @@
   :type '(repeat (list string))
   :group 'riece-highlight)
 
   :type '(repeat (list string))
   :group 'riece-highlight)
 

+(unless (find-face 'riece-modeline-current-face)
+  (make-face 'riece-modeline-current-face
+            "Face used for displaying the current channel in modeline.")
+  (if (featurep 'xemacs)
+      (set-face-parent 'riece-modeline-current-face 'modeline))
+  (set-face-foreground 'riece-modeline-current-face
+                      (face-foreground 'riece-channel-list-current-face)))
+

 (defvar riece-highlight-enabled nil)
 
 (defconst riece-highlight-description
 (defvar riece-highlight-enabled nil)
 
 (defconst riece-highlight-description


@@ -243,7 +251,7 @@
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string

-              string 'face 'riece-channel-list-current-face)))))
+              string 'face 'riece-modeline-current-face)))))

 
 (defun riece-highlight-insinuate ()
   (put 'riece-channel-mode 'font-lock-defaults
 
 (defun riece-highlight-insinuate ()
   (put 'riece-channel-mode 'font-lock-defaults

diff --git a/lisp/riece-history.el b/lisp/riece-history.el
index ae7b667..fd9ea42 100644 (file)
--- a/lisp/riece-history.el
+++ b/lisp/riece-history.el
@@ -62,6 +62,16 @@
   :group 'riece-highlight-faces)
 (defvar riece-channel-list-history-face 'riece-channel-list-history-face)
 
   :group 'riece-highlight-faces)
 (defvar riece-channel-list-history-face 'riece-channel-list-history-face)
 

+(unless (find-face 'riece-modeline-history-face)
+  (make-face 'riece-modeline-history-face
+            "Face used for displaying history channels in modeline.")
+  (if (featurep 'xemacs)
+      (set-face-parent 'riece-modeline-history-face 'modeline))
+  (set-face-foreground 'riece-modeline-history-face
+                      (face-foreground 'riece-channel-list-history-face)))
+
+(defvar riece-modeline-history-face 'riece-modeline-history-face)
+

 (defvar riece-channel-history nil)
 
 (defvar riece-history-enabled nil)
 (defvar riece-channel-history nil)
 
 (defvar riece-history-enabled nil)


@@ -98,7 +108,7 @@
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string

-              string 'face 'riece-channel-list-history-face)))))
+              string 'face 'riece-modeline-history-face)))))

 
 ;;; (defun riece-history-requires ()
 ;;;   (if (memq 'riece-guess riece-addons)
 
 ;;; (defun riece-history-requires ()
 ;;;   (if (memq 'riece-guess riece-addons)

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index 442f23a..9318384 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -220,6 +220,8 @@ the `riece-server-keyword-map' variable."
 (defun riece-close-server-process (process)
   (if riece-debug
       (delete-process process)
 (defun riece-close-server-process (process)
   (if riece-debug
       (delete-process process)

+    (set-process-filter process nil)
+    (set-process-sentinel process nil)

     (kill-buffer (process-buffer process)))
   (setq riece-server-process-alist
        (delq (rassq process riece-server-process-alist)
     (kill-buffer (process-buffer process)))
   (setq riece-server-process-alist
        (delq (rassq process riece-server-process-alist)

diff --git a/lisp/riece-unread.el b/lisp/riece-unread.el
index 0697367..359f86b 100644 (file)
--- a/lisp/riece-unread.el
+++ b/lisp/riece-unread.el
@@ -58,6 +58,14 @@
   :group 'riece-highlight-faces)
 (defvar riece-channel-list-unread-face 'riece-channel-list-unread-face)
 
   :group 'riece-highlight-faces)
 (defvar riece-channel-list-unread-face 'riece-channel-list-unread-face)
 

+(unless (find-face 'riece-modeline-unread-face)
+  (make-face 'riece-modeline-unread-face
+            "Face used for displaying unread channels in modeline.")
+  (if (featurep 'xemacs)
+      (set-face-parent 'riece-modeline-unread-face 'modeline))
+  (set-face-foreground 'riece-modeline-unread-face
+                      (face-foreground 'riece-channel-list-unread-face)))
+

 (defvar riece-unread-channels nil)
 
 (defvar riece-unread-enabled nil)
 (defvar riece-unread-channels nil)
 
 (defvar riece-unread-enabled nil)


@@ -100,7 +108,7 @@
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string
                string (replace-match "%%" nil nil string)))
        (list (format "%d:" index)
              (riece-propertize-modeline-string

-              string 'face 'riece-channel-list-unread-face)))))
+              string 'face 'riece-modeline-unread-face)))))

 
 (defun riece-unread-switch-to-channel ()
   (interactive)
 
 (defun riece-unread-switch-to-channel ()
   (interactive)