From: Daiki Ueno <ueno@unixuser.org>
Date: Wed, 26 May 2004 02:43:08 +0000 (+0000)
Subject: * riece.el (riece-exit): Don't disable addons.
X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=commitdiff_plain;h=db233da28f76a0d9cda97bd169020cf50a869a5d

* 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
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+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.
diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 95bae12..26eebba 100644
--- 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
--- 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