* riece-display.el (riece-update-long-channel-indicator): Change

order to channel, mode, topic.

* riece-message.el (riece-message-make-open-bracket): Come in
first notice message.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dcf8bd9..4b1ee5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2004-06-18  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+       * riece-display.el (riece-update-long-channel-indicator): Change
+       order to channel, mode, topic.
+
+       * riece-message.el (riece-message-make-open-bracket): Come in
+       first notice message.
+       (riece-message-make-close-bracket): Ditto.
+
 2004-06-16  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-commands.el (riece-command-end-of-buffer): New command.

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 304b4bd..9c36ec4 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -280,9 +280,9 @@ Local to the buffer in `riece-buffer-list'.")
   (setq riece-long-channel-indicator
        (if riece-current-channel
            (if (riece-channel-p (riece-identity-prefix riece-current-channel))
-               (riece-concat-channel-modes
+               (riece-concat-channel-topic
                 riece-current-channel
-                (riece-concat-channel-topic
+                (riece-concat-channel-modes
                  riece-current-channel
                  (riece-format-identity riece-current-channel)))
              (riece-format-identity riece-current-channel))

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index ea6285f..f9d3740 100644 (file)
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -66,10 +66,10 @@
 
 (defun riece-message-make-open-bracket (message)
   "Make `open-bracket' string for MESSAGE."
-  (if (riece-message-own-p message)
-      ">"
-    (if (eq (riece-message-type message) 'notice)
-       "{"
+  (if (eq (riece-message-type message) 'notice)
+      "{"
+    (if (riece-message-own-p message)
+       ">"
       (if (riece-message-private-p message)
          "="
        (if (riece-message-external-p message)
@@ -78,10 +78,10 @@
 
 (defun riece-message-make-close-bracket (message)
   "Make `close-bracket' string for MESSAGE."
-  (if (riece-message-own-p message)
-      "<"
-    (if (eq (riece-message-type message) 'notice)
-       "}"
+  (if (eq (riece-message-type message) 'notice)
+      "}"
+    (if (riece-message-own-p message)
+       "<"
       (if (riece-message-private-p message)
          "="
        (if (riece-message-external-p message)