* riece-unread.el (riece-unread-disable): Reset riece-unread-channels.

[riece] / lisp / riece-filter.el

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 6fb3b19..5c1b42b 100644 (file)
--- 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,17 +127,15 @@
   (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 riece-debug
@@ -160,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)