* riece-handle.el (riece-handle-privmsg-message): Check own

[riece] / lisp / riece-server.el

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index b290d57..5c6b420 100644 (file)
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -37,7 +37,7 @@
       (:nickname riece-nickname)
       (:username riece-username)
       (:password)
-      (:function #'open-network-stream)
+      (:function riece-default-open-connection-function)
       (:coding riece-default-coding-system))
     "Mapping from keywords to default values.
 All keywords that can be used must be listed here."))
@@ -103,21 +103,24 @@ the `riece-server-keyword-map' variable."
        (error "Server closed"))))
 
 (put 'riece-with-server-buffer 'lisp-indent-function 1)
+(put 'riece-with-server-buffer 'edebug-form-spec '(form body))
 
 (defun riece-process-send-string (process string)
   (with-current-buffer (process-buffer process)
     (process-send-string process (riece-encode-coding-string string))))
 
-(defun riece-send-string (string)
-  (let* ((server-name
-         (or riece-overriding-server-name
+(defun riece-current-server-name ()
+  (or riece-overriding-server-name
                                        ;already in the server buffer
-             (if (local-variable-p 'riece-server-name (current-buffer))
-                 riece-server-name
-               (if riece-current-channel
-                   (riece-identity-server riece-current-channel)
-                 (if (riece-server-opened "")
-                     "")))))
+      (if (local-variable-p 'riece-server-name (current-buffer))
+         riece-server-name
+       (if riece-current-channel
+           (riece-identity-server riece-current-channel)
+         (if (riece-server-opened "")
+             "")))))
+
+(defun riece-send-string (string)
+  (let* ((server-name (riece-current-server-name))
         (process (riece-server-process server-name)))
     (unless process
       (error "%s" (substitute-command-keys
@@ -150,7 +153,10 @@ the `riece-server-keyword-map' variable."
        (message "Logging in to %s..." server-name))
       (if riece-reconnect-with-password        ;password incorrect or not set.
          (unwind-protect
-             (setq password (riece-read-passwd "Password: "))
+             ;; XEmacs signals an error when the keyboard cannot be grabbed.
+             (condition-case nil
+                 (setq password (riece-read-passwd "Password: "))
+               (error))
            (setq riece-reconnect-with-password nil)))
       (if password
          (riece-process-send-string process
@@ -203,7 +209,7 @@ the `riece-server-keyword-map' variable."
              riece-server-process-alist)))
 
 (defun riece-server-process-opened (process)
-  (memq (process-status process) '(open run)))
+  (not (null (memq (process-status process) '(open run)))))
 
 (defun riece-server-opened (&optional server-name)
   (if server-name
@@ -220,14 +226,15 @@ the `riece-server-keyword-map' variable."
 (eval-when-compile
   (autoload 'riece-exit "riece"))
 (defun riece-quit-server-process (process &optional message)
-  (run-at-time riece-quit-timeout nil
-              (lambda (process)
-                (when (rassq process riece-server-process-alist)
-                  (riece-close-server-process process)
-                  ;; If no server process is available, exit.
-                  (unless riece-server-process-alist
-                    (riece-exit))))
-              process)
+  (if riece-quit-timeout
+      (riece-run-at-time riece-quit-timeout nil
+                        (lambda (process)
+                          (when (rassq process riece-server-process-alist)
+                            (riece-close-server-process process)
+                            ;; If no server process is available, exit.
+                            (unless riece-server-process-alist
+                              (riece-exit))))
+                        process))
   (riece-process-send-string process
                             (if message
                                 (format "QUIT :%s\r\n" message)