* riece-commands.el (riece-command-close-server): Cause error

on non-existent server process.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a251752..28c61e0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-06  Yoichi NAKAYAMA  <yoichi@geiin.org>
+
+       * riece-commands.el (riece-command-close-server): Cause error
+       on non-existent server process.
+

 2006-04-26  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-skk-kakutei.el: Declare some variables and autoload
 2006-04-26  Daiki Ueno  <ueno@unixuser.org>
 
        * riece-skk-kakutei.el: Declare some variables and autoload

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index dcc97b1..9aaec0b 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -722,7 +722,10 @@ If prefix argument ARG is non-nil, toggle frozen status."
         (if current-prefix-arg
             (read-string "Message: ")
           riece-quit-message)))
         (if current-prefix-arg
             (read-string "Message: ")
           riece-quit-message)))

-  (riece-quit-server-process (riece-server-process server-name) message))
+  (let ((process (riece-server-process server-name)))
+    (unless process
+      (error "%s is not opened" server-name))
+    (riece-quit-server-process process message)))

 
 (defun riece-command-universal-server-name-argument ()
   (interactive)
 
 (defun riece-command-universal-server-name-argument ()
   (interactive)