* riece-filter.el (riece-chomp-string): New function.

[riece] / lisp / riece-filter.el

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 91ac12c..dc72e92 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -28,6 +28,7 @@
 (require 'riece-misc)
 (require 'riece-server)                        ;riece-close-server
 (require 'riece-identity)
+(require 'riece-debug)
 
 (defun riece-handle-numeric-reply (prefix number name string)
   (let ((base-number (* (/ number 100) 100))
@@ -40,12 +41,9 @@
             (format "riece-handle-default-%03d-message" base-number))))
     (if (and function
             (symbol-function function))
-       (condition-case error
-           (funcall function prefix number name
-                    (riece-decode-coding-string string))
-         (error
-          (if riece-debug
-              (message "Error in `%S': %S" function error)))))))
+       (riece-ignore-errors (symbol-name function)
+         (funcall function prefix number name
+                  (riece-decode-coding-string string))))))
 
 (defun riece-handle-message (prefix message string)
   (if (and prefix
@@ -58,23 +56,18 @@
   (let ((function (intern-soft (concat "riece-handle-" message "-message")))
        (hook (intern (concat "riece-" message "-hook")))
        (after-hook (intern (concat "riece-after-" message "-hook"))))
-    (unless (condition-case error
-               (run-hook-with-args-until-success hook prefix string)
-             (error
-              (if riece-debug
-                  (message "Error in `%S': %S" hook error))
-              nil))
+    (unless (riece-ignore-errors (symbol-name hook)
+             (run-hook-with-args-until-success hook prefix string))
       (if function
-         (condition-case error
-             (funcall function prefix string)
-           (error
-            (if riece-debug
-                (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 in `%S': %S" after-hook error)))))))
+         (riece-ignore-errors (symbol-name function)
+           (funcall function prefix string)))
+      (riece-ignore-errors (symbol-name after-hook)
+       (run-hook-with-args-until-success after-hook prefix string)))))
+
+(defun riece-chomp-string (string)
+  (if (string-match "\r?\n\\'" string)
+      (substring string 0 (match-beginning 0))
+    string))
 
 (defun riece-filter (process input)
   (save-excursion
@@ -88,20 +81,20 @@
                 (setq riece-read-point (point))))
     (beginning-of-line)
     (while (and (not (eobp))
-               (looking-at ".*\r\n"))  ;the input line is not finished
+               (looking-at ".*\n"))    ;the input line is not finished
       (save-excursion
        (if (looking-at
-            ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\r\n")
+            ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\n")
            (riece-handle-numeric-reply
             (match-string 1)           ;prefix
             (string-to-number (match-string 2)) ;number
             (match-string 3)           ;name
-            (match-string 4))          ;reply string
-         (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n")
+            (riece-chomp-string (match-string 4)))             ;reply string
+         (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\n")
              (riece-handle-message
               (match-string 2)         ;optional prefix
               (match-string 3)         ;command
-              (match-string 4))        ;params & trailing
+              (riece-chomp-string (match-string 4)))   ;params & trailing
            (if riece-debug
                (message "Weird message from server: %s"
                         (buffer-substring (point) (progn