update.

[elisp/liece.git] / lisp / liece-commands.el

diff --git a/lisp/liece-commands.el b/lisp/liece-commands.el
index 29fbedd..5062929 100644 (file)
--- a/lisp/liece-commands.el
+++ b/lisp/liece-commands.el
@@ -40,14 +40,17 @@
 
 (autoload 'liece-dcc-chat-send "liece-dcc")
 
+(autoload 'liece-command-ctcp-action "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-version "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-userinfo "liece-ctcp" nil t)
+(autoload 'liece-command-ctcp-userinfo-from-minibuffer "liece-ctcp" nil t)
+(autoload 'liece-command-ctcp-help "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-clientinfo "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-ping "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-time "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-x-face "liece-ctcp" nil t)
+(autoload 'liece-command-ctcp-x-face-from-xbm-file "liece-ctcp" nil t)
 (autoload 'liece-command-ctcp-comment "liece-ctcp" nil t)
-(autoload 'liece-command-ctcp-help "liece-ctcp" nil t)
 
 (defun liece-command-poll-names ()
   "Handler for polling NAMES."
@@ -229,9 +232,8 @@ with specified user."
               (if (eq current-prefix-arg '-)
                   (read-string
                    (format (_ "Key for channel %s: ") join-channel-var))
-                (let ((passwd-echo ?*))
-                  (read-passwd
-                   (format (_ "Key for channel %s: ") join-channel-var))))))
+                (liece-read-passwd
+                 (format (_ "Key for channel %s: ") join-channel-var)))))
      (list join-channel-var key)))
   (let ((real-chnl (liece-channel-real join-channel-var)))
     (if (numberp join-channel-var)
@@ -337,8 +339,8 @@ If SILENT is non-nil, don't notify current status."
                                       (car ignore))))
        ;; did not find, add to ignored ones
        (let ((expire-time (if (> timeout 0)
-                              (liece-time-add (current-time)
-                                               (* timeout 60)))))
+                              (liece-time-elapsed (current-time)
+                                                  (* timeout 60)))))
          (and silent (> timeout 0)
               (setcar (cdr (cdr expire-time)) -1))
          (setq liece-kill-nickname
@@ -761,9 +763,7 @@ If prefix argument ARG is non-nil, leave signoff message."
           (if arg (read-string (_ "Signoff message: "))
             (or liece-signoff-message
                 (product-name (product-find 'liece-version))))))
-      (if quit-string
-         (liece-send "QUIT :%s" quit-string)
-       (liece-send "QUIT")))))
+      (liece-close-server quit-string))))
 
 (defun liece-command-generic (message)
   "Enter a generic IRC MESSAGE, which is sent to the server.