* riece-server.el: Move autoload setting for 'riece-exit before

riece-open-server.

* riece-message.el (riece-format-message): Use speaker's
server-name instead of the current server-name.

* riece-ignore.el: Autoload 'riece-dialogue-mode.

* riece-identity.el (riece-format-identity): Put
'riece-format-identity-prefix-only property.

* riece-icon.el: Require 'riece-globals and 'riece-signal.

* riece-history.el: Require 'riece-signal.

* riece-highlight.el: Require 'riece-misc.

* riece-alias.el: Require 'riece-signal.

* riece-addon.el: Require 'font-lock, 'riece-options,
'riece-compat, and 'riece-misc.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eadaf96..b082537 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,27 @@
+2004-05-29  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-server.el: Move autoload setting for 'riece-exit before
+       riece-open-server.
+
+       * riece-message.el (riece-format-message): Use speaker's
+       server-name instead of the current server-name.
+
+       * riece-ignore.el: Autoload 'riece-dialogue-mode.
+
+       * riece-identity.el (riece-format-identity): Put
+       'riece-format-identity-prefix-only property.
+
+       * riece-icon.el: Require 'riece-globals and 'riece-signal.
+
+       * riece-history.el: Require 'riece-signal.
+
+       * riece-highlight.el: Require 'riece-misc.
+
+       * riece-alias.el: Require 'riece-signal.
+
+       * riece-addon.el: Require 'font-lock, 'riece-options,
+       'riece-compat, and 'riece-misc.
+
 2004-05-29  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-commands.el (riece-command-switch-to-channel): Change prompt.

diff --git a/lisp/riece-addon.el b/lisp/riece-addon.el
index 4379095..9715bd1 100644 (file)
--- a/lisp/riece-addon.el
+++ b/lisp/riece-addon.el
@@ -24,6 +24,11 @@
 
 ;;; Code:
 
+(require 'font-lock)
+(require 'riece-options)
+(require 'riece-compat)
+(require 'riece-misc)
+
 (defgroup riece-addon-list nil
   "Add-on management"
   :tag "Addon"

diff --git a/lisp/riece-alias.el b/lisp/riece-alias.el
index cdb90f2..bbf7db9 100644 (file)
--- a/lisp/riece-alias.el
+++ b/lisp/riece-alias.el
@@ -33,6 +33,7 @@
 ;;; Code:
 
 (require 'riece-identity)
+(require 'riece-signal)
 
 (defgroup riece-alias nil
   "Define aliases of names"

diff --git a/lisp/riece-highlight.el b/lisp/riece-highlight.el
index b5afa46..ca9baef 100644 (file)
--- a/lisp/riece-highlight.el
+++ b/lisp/riece-highlight.el
@@ -27,6 +27,7 @@
 (require 'riece-globals)
 (require 'riece-options)               ;riece-channel-list-buffer-mode
 (require 'riece-identity)              ;riece-format-identity
+(require 'riece-misc)
 (require 'font-lock)
 (require 'derived)
 

diff --git a/lisp/riece-history.el b/lisp/riece-history.el
index e737159..ae7b667 100644 (file)
--- a/lisp/riece-history.el
+++ b/lisp/riece-history.el
@@ -35,6 +35,7 @@
 (require 'riece-globals)
 (require 'riece-highlight)
 (require 'riece-identity)
+(require 'riece-signal)
 (require 'ring)
 
 (defgroup riece-history nil

diff --git a/lisp/riece-icon.el b/lisp/riece-icon.el
index 9780886..9e99799 100644 (file)
--- a/lisp/riece-icon.el
+++ b/lisp/riece-icon.el
@@ -29,6 +29,9 @@
 
 ;;; Code:
 
+(require 'riece-globals)
+(require 'riece-signal)
+
 (defvar riece-channel-list-icons
   '((" " . "/* XPM */
 static char * blank_xpm[] = {

diff --git a/lisp/riece-identity.el b/lisp/riece-identity.el
index e254dc3..fea3ef4 100644 (file)
--- a/lisp/riece-identity.el
+++ b/lisp/riece-identity.el
@@ -139,6 +139,10 @@ will be added."
     (if riece-abbrev-identity-string-function
        (setq string (funcall riece-abbrev-identity-string-function string)))
     (put-text-property 0 (length string) 'riece-identity identity string)
+    (if prefix-only
+       (put-text-property 0 (length string)
+                          'riece-format-identity-prefix-only t
+                          string))
     string))
 
 (defun riece-parse-identity (string)

diff --git a/lisp/riece-ignore.el b/lisp/riece-ignore.el
index 42a3396..75f2ba5 100644 (file)
--- a/lisp/riece-ignore.el
+++ b/lisp/riece-ignore.el
@@ -95,6 +95,8 @@ Otherwise, they are not removed from IRC buffers, but are hidden with
        'user-renamed
        #'riece-ignore-user-rename-signal-function))))
 
+(eval-when-compile
+  (autoload 'riece-dialogue-mode "riece"))
 (defun riece-ignore-message-filter (message)
   (if (and riece-ignore-enabled
           (riece-identity-member (riece-message-speaker message)

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 4eccca7..ea6285f 100644 (file)
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -152,7 +152,7 @@ Normally they are *Dialogue* and/or *Others*."
             (funcall riece-message-make-global-name-function message)
           (funcall riece-message-make-name-function message)))
        (server-name (riece-identity-server (riece-message-speaker message))))
-    (riece-with-server-buffer (riece-current-server-name)
+    (riece-with-server-buffer server-name
       (concat
        (if global
           (riece-concat-server-name

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index d49e4d4..442f23a 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -127,6 +127,8 @@ the `riece-server-keyword-map' variable."
                   "Type \\[riece-command-open-server] to open server.")))
     (riece-process-send-string process string)))
 
+(eval-when-compile
+  (autoload 'riece-exit "riece"))
 (defun riece-open-server (server server-name)
   (riece-server-keyword-bind server
     (let (selective-display
@@ -238,8 +240,6 @@ the `riece-server-keyword-map' variable."
              (throw 'found t))
          (setq alist (cdr alist)))))))
 
-(eval-when-compile
-  (autoload 'riece-exit "riece"))
 (defun riece-quit-server-process (process &optional message)
   (if riece-quit-timeout
       (riece-run-at-time riece-quit-timeout nil