From 813f7c10ca7387ae3cf4c50e447e65a3866cc70e Mon Sep 17 00:00:00 2001 From: ueno Date: Thu, 3 Jun 2004 02:04:57 +0000 Subject: [PATCH] * riece-server.el (riece-open-server): When password input is quitted, delete the current server process manually. (riece-close-server-process): Always kill process buffer. (riece-quit-server-process): If the connection is timed out, delete the current server process manually. --- lisp/ChangeLog | 8 ++++++++ lisp/riece-server.el | 19 ++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 24fec2d..66b3c6e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2004-06-03 Daiki Ueno + + * riece-server.el (riece-open-server): When password input is + quitted, delete the current server process manually. + (riece-close-server-process): Always kill process buffer. + (riece-quit-server-process): If the connection is timed out, + delete the current server process manually. + 2004-06-02 Daiki Ueno * riece-unread.el: Use riece-facep to check existence of diff --git a/lisp/riece-server.el b/lisp/riece-server.el index 9318384..6b7e1e6 100644 --- a/lisp/riece-server.el +++ b/lisp/riece-server.el @@ -170,11 +170,7 @@ the `riece-server-keyword-map' variable." 'quit))) (setq riece-reconnect-with-password nil))) (if (eq password 'quit) - (progn - (riece-close-server-process process) - ;; If no server process is available, exit. - (unless riece-server-process-alist - (riece-exit))) + (delete-process process) (if password (riece-process-send-string process (format "PASS %s\r\n" password))) @@ -218,11 +214,7 @@ the `riece-server-keyword-map' variable." (erase-buffer))) (defun riece-close-server-process (process) - (if riece-debug - (delete-process process) - (set-process-filter process nil) - (set-process-sentinel process nil) - (kill-buffer (process-buffer process))) + (kill-buffer (process-buffer process)) (setq riece-server-process-alist (delq (rassq process riece-server-process-alist) riece-server-process-alist))) @@ -246,11 +238,8 @@ the `riece-server-keyword-map' variable." (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)))) + (if (rassq process riece-server-process-alist) + (delete-process process))) process)) (riece-process-send-string process (if message -- 1.7.10.4