From f3a3f75f31dafbca55e36207eb7894620fa37a1f Mon Sep 17 00:00:00 2001
From: ueno <ueno>
Date: Thu, 29 May 2003 20:15:30 +0000
Subject: [PATCH] * riece-misc.el (riece-get-users-on-server): Moved from
 riece-commands.el.

* riece-ctcp.el: New file.
* COMPILE (riece-modules): Add riece-ctcp.
* Makefile.am (EXTRA_DIST): Add riece-ctcp.el
---
 lisp/COMPILE           |    5 ++++-
 lisp/ChangeLog         |    9 +++++++++
 lisp/Makefile.am       |    3 ++-
 lisp/riece-commands.el |   20 ++++----------------
 lisp/riece-message.el  |   28 ++++++++++++----------------
 lisp/riece-misc.el     |   12 ++++++++++++
 6 files changed, 43 insertions(+), 34 deletions(-)

diff --git a/lisp/COMPILE b/lisp/COMPILE
index 62366a3..128ec4e 100644
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -38,7 +38,10 @@
 		riece-500
 
 		riece-commands
-		riece))))
+		riece
+
+		;; add-ons
+		riece-ctcp))))
 
 (defun riece-compile-modules (modules)
   (let ((load-path (cons nil load-path)))
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8fc279..869da0f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2003-05-29  Daiki Ueno  <ueno@unixuser.org>
 
+	* riece-misc.el (riece-get-users-on-server): Moved from
+	riece-commands.el.
+
+	* riece-ctcp.el: New file.
+	* COMPILE (riece-modules): Add riece-ctcp.
+	* Makefile.am (EXTRA_DIST): Add riece-ctcp.el
+
+2003-05-29  Daiki Ueno  <ueno@unixuser.org>
+
 	* Riece: Version 0.0.1 released.
 
 	* riece-commands.el (riece-command-names): New command.
diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index 89f0745..366a471 100644
--- a/lisp/Makefile.am
+++ b/lisp/Makefile.am
@@ -5,7 +5,8 @@ EXTRA_DIST = COMPILE ChangeLog ChangeLog.Liece \
 	riece-globals.el riece-handle.el riece-highlight.el riece-identity.el \
 	riece-inlines.el riece-message.el riece-misc.el riece-naming.el \
 	riece-options.el riece-server.el riece-user.el riece-version.el \
-	riece-xemacs.el riece.el
+	riece-xemacs.el riece.el \
+	riece-ctcp.el
 
 CLEANFILES = auto-autoloads.el custom-load.el *.elc
 FLAGS ?= -batch -q -no-site-file
diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index f00eb99..7ed3322 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -38,7 +38,7 @@
 ;;; Channel movement:
 (defun riece-command-switch-to-channel (channel)
   (interactive
-   (list (completing-read "Channel/user: "
+   (list (completing-read "Channel/User: "
 			  (mapcar #'list riece-current-channels)
 			  nil t)))
   (riece-switch-to-channel channel)
@@ -127,18 +127,6 @@
 	(not riece-channel-list-buffer-mode))
   (riece-command-configure-windows))
 
-(defun riece-get-users-on-server ()
-  (riece-with-server-buffer
-   (let (users)
-     (mapatoms
-      (lambda (atom)
-	(unless (riece-channel-p (symbol-name atom))
-	  (push (symbol-name atom) users)))
-      riece-obarray)
-     (if (member riece-real-nickname users)
-	 users
-       (cons riece-real-nickname users)))))
-
 (defun riece-command-finger (user &optional recurse)
   (interactive
    (let* ((completion-ignore-case t)
@@ -227,7 +215,7 @@
 	  (channel
 	   (if current-prefix-arg
 	       (completing-read
-		"Channel/user: "
+		"Channel/User: "
 		(mapcar #'list riece-current-channels))
 	     riece-current-channel))
 	  (riece-overriding-server-name (riece-identity-server channel))
@@ -360,7 +348,7 @@
   (interactive
    (let ((completion-ignore-case t)
 	 (target
-	  (completing-read "Channel/user: "
+	  (completing-read "Channel/User: "
 			   (mapcar #'list riece-current-channels)))
 	 key)
      (if (and current-prefix-arg
@@ -396,7 +384,7 @@
   (interactive
    (let ((completion-ignore-case t)
 	 (target
-	  (completing-read "Channel/user: "
+	  (completing-read "Channel/User: "
 			   (mapcar #'list riece-current-channels)
 			   nil t (cons riece-current-channel 0)))
 	 message)
diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 6acb78e..f2312ad 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -73,26 +73,22 @@
   (if (eq open-p (riece-message-own-p message))
       (if (eq (riece-message-type message) 'notice)
 	  "-"
-	(if (eq (riece-message-type message) 'action)
-	    "]"
-	  (if (riece-message-private-p message)
-	      (if (riece-message-own-p message)
-		  ">"
-		"=")
-	    (if (riece-message-external-p message)
-		")"
-	      ">"))))
-    (if (eq (riece-message-type message) 'notice)
-	"-"
-      (if (eq (riece-message-type message) 'action)
-	  "["
 	(if (riece-message-private-p message)
 	    (if (riece-message-own-p message)
-		  "<"
+		">"
 	      "=")
 	  (if (riece-message-external-p message)
-	      "("
-	    "<"))))))
+	      ")"
+	    ">")))
+    (if (eq (riece-message-type message) 'notice)
+	"-"
+      (if (riece-message-private-p message)
+	  (if (riece-message-own-p message)
+	      "<"
+	    "=")
+	(if (riece-message-external-p message)
+	    "("
+	  "<")))))
 
 (defun riece-message-make-name (message)
   "Makes local identity for MESSAGE."
diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 8090332..bad8928 100644
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -167,6 +167,18 @@
       (substring user-at-host 1)
     user-at-host))
 
+(defun riece-get-users-on-server ()
+  (riece-with-server-buffer
+   (let (users)
+     (mapatoms
+      (lambda (atom)
+	(unless (riece-channel-p (symbol-name atom))
+	  (push (symbol-name atom) users)))
+      riece-obarray)
+     (if (member riece-real-nickname users)
+	 users
+       (cons riece-real-nickname users)))))
+
 (provide 'riece-misc)
 
 ;;; riece-misc.el ends here
-- 
1.7.10.4