* riece-handle.el (riece-300): Require 'riece-000, 'riece-200,

[riece] / lisp / riece-filter.el

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 06a5137..5dc9cf6 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -24,18 +24,14 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-inlines))
-
 (require 'riece-handle)
 (require 'riece-misc)
 (require 'riece-server)                        ;riece-close-server
+(require 'riece-identity)
 
 (defun riece-handle-numeric-reply (prefix number name string)
   (let ((base-number (* (/ number 100) 100))
        function)
-    (condition-case nil
-       (require (intern (format "riece-%03d" base-number)))
-      (error))
     (setq function (intern-soft (format "riece-handle-%03d-message" number)))
     (unless (and function
                 (symbol-function function))
@@ -49,16 +45,7 @@
                     (riece-decode-coding-string string))
          (error
           (if riece-debug
-              (message "Error occurred in `%S': %S" function error)))))))
-
-(defun riece-default-handle-numeric-reply
-  (client-prefix prefix number name string)
-  (riece-insert
-   (list riece-dialogue-buffer riece-others-buffer)
-   (concat client-prefix
-          (riece-concat-server-name
-           (mapconcat #'identity (riece-split-parameters string) " "))
-          "\n")))
+              (message "Error in `%S': %S" function error)))))))
 
 (defun riece-handle-message (prefix message string)
   (if (and prefix
@@ -75,19 +62,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
@@ -125,34 +112,41 @@
        (forward-line)))))
 
 (eval-when-compile
-  (autoload 'riece "riece"))
+  (autoload 'riece-exit "riece"))
 (defun riece-sentinel (process status)
   (if riece-reconnect-with-password
-      (unwind-protect
-         (if (eq process riece-server-process)
-             (riece)                   ;Need to initialize system.
-           (let ((server-name
-                  (car (rassq process riece-server-process-alist))))
-             (riece-close-server server-name)
-             (riece-open-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 server-name
-             (message "Connection to \"%s\" closed: %s"
-                      server-name (match-string 1 status))
-           (message "Connection closed: %s" (match-string 1 status)))
-       (if server-name
+      (if riece-debug
+         (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: %s"
-                  (substring status 0 (1- (length status))))))
-      (riece-close-server server-name))))
+                    server-name (substring status 0 (1- (length status)))))
+       (if (equal server-name "")
+           (message "Connection closed")
+         (message "Connection to \"%s\" closed" server-name)))
+      (let ((channels riece-current-channels))
+       (while channels
+         (if (and (car channels)
+                  (equal (riece-identity-server (car channels))
+                         server-name))
+             (riece-part-channel (car channels)))
+         (setq channels (cdr channels))))
+      (riece-redisplay-buffers)
+      (riece-close-server-process process)
+      ;; If no server process is available, exit.
+      (unless riece-server-process-alist
+       (riece-exit)))))
 
 (provide 'riece-filter)