*** flymake.el	2009-01-25 11:38:32.000000000 -0500
--- flymake_mod.el	2009-01-25 11:44:06.000000000 -0500
***************
*** 67,72 ****
--- 67,76 ----
    "Same as `flymake-err-info', effective when a syntax check is in progress.")
  (make-variable-buffer-local 'flymake-new-err-info)
  
+ (defvar  flymake-split-output-pattern "[\n\r]+"
+   "Regular expression used to split the output into individual error/warning messages")
+ (make-variable-buffer-local 'flymake-split-output-pattern)
+ 
  ;;;; [[ cross-emacs compatibility routines
  (defsubst flymake-makehash (&optional test)
    (if (fboundp 'make-hash-table)
***************
*** 863,869 ****
  Return last one as residual if it does not end with newline char.
  Returns ((LINES) RESIDUAL)."
    (when (and output (> (length output) 0))
!     (let* ((lines (flymake-split-string output "[\n\r]+"))
  	   (complete (equal "\n" (char-to-string (aref output (1- (length output))))))
  	   (residual nil))
        (when (not complete)
--- 867,873 ----
  Return last one as residual if it does not end with newline char.
  Returns ((LINES) RESIDUAL)."
    (when (and output (> (length output) 0))
!     (let* ((lines (flymake-split-string output  flymake-split-output-pattern))
  	   (complete (equal "\n" (char-to-string (aref output (1- (length output))))))
  	   (residual nil))
        (when (not complete)