Undo the last change.

[riece] / lisp / riece-filter.el

diff --git a/lisp/riece-filter.el b/lisp/riece-filter.el
index 71a8bc1..9182404 100644 (file)
--- a/lisp/riece-filter.el
+++ b/lisp/riece-filter.el
@@ -64,7 +64,7 @@
       (riece-ignore-errors (symbol-name after-hook)
        (run-hook-with-args-until-success after-hook prefix string)))))
 
-(defun riece-chomp-string (string)
+(defsubst riece-chomp-string (string)
   (if (string-match "\r\\'" string)
       (substring string 0 (match-beginning 0))
     string))
@@ -84,17 +84,17 @@
                (looking-at ".*\n"))    ;the input line is not finished
       (save-excursion
        (if (looking-at
-            ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)")
+            ":\\([^ ]+\\) +\\([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
-            (riece-chomp-string (match-string 4)))             ;reply string
-         (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)")
+            (riece-chomp-string (match-string 4))) ;reply string
+         (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\n")
              (riece-handle-message
               (match-string 2)         ;optional prefix
               (match-string 3)         ;command
-              (riece-chomp-string (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