* 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

diff --git a/lisp/COMPILE b/lisp/COMPILE
index 62366a3..128ec4e 100644 (file)
--- a/lisp/COMPILE
+++ b/lisp/COMPILE
@@ -38,7 +38,10 @@
                riece-500
 
                riece-commands
                riece-500
 
                riece-commands

-               riece))))
+               riece
+
+               ;; add-ons
+               riece-ctcp))))

 
 (defun riece-compile-modules (modules)
   (let ((load-path (cons nil load-path)))
 
 (defun riece-compile-modules (modules)
   (let ((load-path (cons nil load-path)))

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f8fc279..869da0f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+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.
 2003-05-29  Daiki Ueno  <ueno@unixuser.org>
 
        * Riece: Version 0.0.1 released.

diff --git a/lisp/Makefile.am b/lisp/Makefile.am
index 89f0745..366a471 100644 (file)
--- 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-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
 
 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 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -38,7 +38,7 @@
 ;;; Channel movement:
 (defun riece-command-switch-to-channel (channel)
   (interactive
 ;;; 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)
                          (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))
 
        (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)
 (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
           (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))
                (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
   (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
                           (mapcar #'list riece-current-channels)))
         key)
      (if (and current-prefix-arg


@@ -396,7 +384,7 @@
   (interactive
    (let ((completion-ignore-case t)
         (target
   (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)
                           (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 (file)
--- 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 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-private-p message)
            (if (riece-message-own-p message)

-                 "<"
+               ">"

              "=")
          (if (riece-message-external-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."
 
 (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 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -167,6 +167,18 @@
       (substring user-at-host 1)
     user-at-host))
 
       (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
 (provide 'riece-misc)
 
 ;;; riece-misc.el ends here