* 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 64e917d..5dc9cf6 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -28,14 +28,10 @@
 (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))
        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
@@ -156,7 +143,10 @@
              (riece-part-channel (car channels)))
          (setq channels (cdr channels))))
       (riece-redisplay-buffers)
-      (riece-close-server-process process))))
+      (riece-close-server-process process)
+      ;; If no server process is available, exit.
+      (unless riece-server-process-alist
+       (riece-exit)))))
 
 (provide 'riece-filter)