* riece-lsdb.el: Add autoload setting for lsdb-maphash.

[riece] / lisp / riece-filter.el

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index fb8894d..f522c48 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -128,31 +128,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 +158,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)