X-Git-Url: http://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-commands.el;h=83035047b49b8625ff6f1c79e60bd376cdac10c2;hp=2c8cb1aa18a2722f7d9f6ad0a42d2b645bd591ba;hb=b5c2ca851feaab6119ec09de3c0922fc07197b75;hpb=005a2a7642c9f43d699922799801124a77d56f5d

diff --git a/lisp/riece-commands.el b/lisp/riece-commands.el
index 2c8cb1a..8303504 100644
--- a/lisp/riece-commands.el
+++ b/lisp/riece-commands.el
@@ -51,7 +51,7 @@
     (if channel
 	(riece-command-switch-to-channel channel)
       (error "No such number!"))))
-	
+
 (eval-and-compile
   (let ((number 1))
     (while (<= number 20)
@@ -89,7 +89,8 @@
 	  (start riece-current-channels)
 	  channel)
       (while (and start (not (eq start pointer)))
-	(setq channel (car start))
+	(if (car start)
+	    (setq channel (car start)))
 	(setq start (cdr start)))
       (when (null channel)
 	(setq start (copy-sequence riece-current-channels))
@@ -564,10 +565,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
 		   (riece-extended-version))))
 	    (process-list riece-process-list))
 	(while process-list
-	  (riece-process-send-string (car process-list)
-				     (if message
-				       (format "QUIT :%s\r\n" message)
-				     "QUIT\r\n"))
+	  (riece-quit-server-process (car process-list) message)
 	  (setq process-list (cdr process-list))))))
 
 (defun riece-command-raw (command)
@@ -617,10 +615,7 @@ If prefix argument ARG is non-nil, toggle frozen status."
 	     (read-string "Message: ")
 	   (or riece-quit-message
 	       (riece-extended-version)))))
-  (riece-process-send-string (riece-server-process server-name)
-			     (if message
-				 (format "QUIT :%s\r\n" message)
-			       "QUIT\r\n")))
+  (riece-quit-server-process (riece-server-process server-name) message))
 
 (defun riece-command-universal-server-name-argument ()
   (interactive)