X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;ds=sidebyside;f=lisp%2Friece-filter.el;h=5c1b42b684c6101583b8ea3d17b283064f97c9fe;hb=6ba2b9c5a8125b926cae3d92663523f207da508e;hp=fb8894d4a6f37c466daf4fdd1e57831415cb5779;hpb=005a2a7642c9f43d699922799801124a77d56f5d;p=riece

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index fb8894d..5c1b42b 100644
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -28,7 +28,6 @@
 (require 'riece-misc)
 (require 'riece-server)			;riece-close-server
 (require 'riece-identity)
-(require 'riece-display)
 
 (defun riece-handle-numeric-reply (prefix number name string)
   (let ((base-number (* (/ number 100) 100))
@@ -49,7 +48,7 @@
 		     (riece-decode-coding-string string))
 	  (error
 	   (if riece-debug
-	       (message "Error occurred in `%S': %S" function error)))))))
+	       (message "Error in `%S': %S" function error)))))))
 
 (defun riece-default-handle-numeric-reply
   (client-prefix prefix number name string)
@@ -75,19 +74,19 @@
 		(run-hook-with-args-until-success hook prefix string)
 	      (error
 	       (if riece-debug
-		   (message "Error occurred in `%S': %S" hook error))
+		   (message "Error in `%S': %S" hook error))
 	       nil))
       (if function
 	  (condition-case error
 	      (funcall function prefix string)
 	    (error
 	     (if riece-debug
-		 (message "Error occurred in `%S': %S" function error)))))
+		 (message "Error in `%S': %S" function error)))))
       (condition-case error
 	  (run-hook-with-args-until-success after-hook prefix string)
 	(error
 	 (if riece-debug
-	     (message "Error occurred in `%S': %S" after-hook error)))))))
+	     (message "Error in `%S': %S" after-hook error)))))))
 
 (defun riece-filter (process input)
   (save-excursion
@@ -128,31 +127,26 @@
   (autoload 'riece-exit "riece"))
 (defun riece-sentinel (process status)
   (if riece-reconnect-with-password
-      (unwind-protect
-	  (let ((server-name
-		 (with-current-buffer (process-buffer process)
-		   riece-server-name)))
-	    (riece-close-server-process process)
-	    (riece-open-server
-	     (if (equal server-name "")
-		 riece-server
-	       (riece-server-name-to-server server-name))
-	     server-name))
-	(setq riece-reconnect-with-password nil))
+      (let ((server-name
+	     (with-current-buffer (process-buffer process)
+	       riece-server-name)))
+	(riece-close-server-process process)
+	(riece-open-server
+	 (if (equal server-name "")
+	     riece-server
+	   (riece-server-name-to-server server-name))
+	 server-name))
     (let ((server-name (with-current-buffer (process-buffer process)
 			 riece-server-name)))
-      (if (and (process-id process)		;not a network connection
-	       (string-match "^exited abnormally with code \\([0-9]+\\)"
-			     status))
+      (if riece-debug
 	  (if (equal server-name "")
-	      (message "Connection closed: %s" (match-string 1 status))
+	      (message "Connection closed: %s"
+		       (substring status 0 (1- (length status))))
 	    (message "Connection to \"%s\" closed: %s"
-		     server-name (match-string 1 status)))
+		     server-name (substring status 0 (1- (length status)))))
 	(if (equal server-name "")
-	    (message "Connection closed: %s"
-		   (substring status 0 (1- (length status))))
-	  (message "Connection to \"%s\" closed: %s"
-		   server-name (substring status 0 (1- (length status))))))
+	    (message "Connection closed")
+	  (message "Connection to \"%s\" closed" server-name)))
       (let ((channels riece-current-channels))
 	(while channels
 	  (if (and (car channels)
@@ -163,7 +157,7 @@
       (riece-redisplay-buffers)
       (riece-close-server-process process)
       ;; If no server process is available, exit.
-      (unless riece-process-list
+      (unless riece-server-process-alist
 	(riece-exit)))))
 
 (provide 'riece-filter)