From db92be784a9f8889807328626642e1ab45fbc4ab Mon Sep 17 00:00:00 2001 From: ueno Date: Wed, 8 Oct 2003 19:42:55 +0000 Subject: [PATCH] * riece-filter.el (riece-sentinel): Don't call riece-exit here. * riece-server.el (riece-close-server-process): Call riece-exit. --- lisp/ChangeLog | 6 ++++-- lisp/riece-filter.el | 5 +---- lisp/riece-server.el | 5 ++++- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 43daee8..e402723 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,9 @@ 2003-10-08 Daiki Ueno - * riece-server.el (riece-quit-server-process): Call - riece-close-server-process instead of kill-process. + * riece-filter.el (riece-sentinel): Don't call riece-exit here. + * riece-server.el (riece-close-server-process): Call riece-exit. + (riece-quit-server-process): Call riece-close-server-process + instead of kill-process. 2003-10-07 Daiki Ueno diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el index 89abe6f..64e917d 100644 --- a/lisp/riece-filter.el +++ b/lisp/riece-filter.el @@ -156,10 +156,7 @@ (riece-part-channel (car channels))) (setq channels (cdr channels)))) (riece-redisplay-buffers) - (riece-close-server-process process) - ;; If no server process is available, exit. - (unless riece-process-list - (riece-exit))))) + (riece-close-server-process process)))) (provide 'riece-filter) diff --git a/lisp/riece-server.el b/lisp/riece-server.el index 89e9237..68f8c9b 100644 --- a/lisp/riece-server.el +++ b/lisp/riece-server.el @@ -197,7 +197,10 @@ the `riece-server-keyword-map' variable." (if riece-debug (delete-process process) (kill-buffer (process-buffer process))) - (setq riece-process-list (delq process riece-process-list))) + (setq riece-process-list (delq process riece-process-list)) + ;; If no server process is available, exit. + (unless riece-process-list + (riece-exit))) (defun riece-server-opened (&optional server-name) (let ((process-list riece-process-list)) -- 1.7.10.4