* riece.el (riece-exit): Don't disable addons.

* riece-commands.el (riece-command-quit): Don't query user to
input y/n if there is no server process.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aedd188..3cb9dcd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2004-05-26  Daiki Ueno  <ueno@unixuser.org>
 
+       * riece.el (riece-exit): Don't disable addons.
+
+       * riece-commands.el (riece-command-quit): Don't query user to
+       input y/n if there is no server process.
+
+2004-05-26  Daiki Ueno  <ueno@unixuser.org>
+
        * riece-highlight.el: Require 'derived.
        (riece-highlight-setup-dialogue): Turn on font-lock if
        riece-highlight-enabled.

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 95bae12..26eebba 100644 (file)
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -592,18 +592,19 @@ If prefix argument ARG is non-nil, toggle frozen status."
 (defun riece-command-quit (&optional arg)
   "Quit IRC."
   (interactive "P")
-  (if (y-or-n-p "Really quit IRC? ")
-      (if riece-server-process-alist
-         (let ((message
-                (if arg
-                    (read-string "Message: ")
-                  riece-quit-message))
-               (alist riece-server-process-alist))
-           (while alist
-             (riece-quit-server-process (cdr (car alist)) message)
-             (setq alist (cdr alist))))
-       ;; If no server process is available, exit immediately.
-       (riece-exit))))
+  (if (null riece-server-process-alist)
+      (progn
+       (message "No server process")
+       (ding))
+    (if (y-or-n-p "Really quit IRC? ")
+       (let ((message
+              (if arg
+                  (read-string "Message: ")
+              riece-quit-message))
+             (alist riece-server-process-alist))
+         (while alist
+           (riece-quit-server-process (cdr (car alist)) message)
+           (setq alist (cdr alist)))))))
 
 (defun riece-command-raw (command)
   "Enter raw IRC command, which is sent to the server."

diff --git a/lisp/riece.el b/lisp/riece.el
index aeaea19..43239ae 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -328,10 +328,6 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
        (delete-region start end)))))
 
 (defun riece-exit ()
-  (let ((pointer riece-addons))
-    (while pointer
-      (riece-disable-addon (car pointer) riece-debug)
-      (setq pointer (cdr pointer))))
   (if riece-save-variables-are-dirty
       (riece-save-variables-files))
   (while riece-buffer-list