2 files changed, 8 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bceb4959171..0d9b4b10d6c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * progmodes/compile.el (compilation-parse-errors):
+        Use compilation--put-prop.
+        (compilation--ensure-parse): Check compilation-multiline.
+
         * emacs-lisp/easymenu.el (easy-menu-create-menu): Use closures.
 
         * emacs-lisp/lisp-mode.el (eval-defun-2): Simplify, using lexical-binding.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index e25be05fb09..3b86ddc1567 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1354,9 +1354,7 @@ to `compilation-error-regexp-alist' if RULES is nil."
                            (eq (car face) 'face)
                            (or (symbolp (cadr face))
                                (stringp (cadr face))))
-                      (put-text-property
-                       (match-beginning mn) (match-end mn)
-                       'font-lock-face (cadr face))
+                      (compilation--put-prop mn 'font-lock-face (cadr face))
                       (add-text-properties
                        (match-beginning mn) (match-end mn)
                        (nthcdr 2 face)))
@@ -1394,6 +1392,9 @@ to `compilation-error-regexp-alist' if RULES is nil."
         (move-marker compilation--parsed limit)
         (goto-char start)
         (forward-line 0)  ;Not line-beginning-position: ignore (comint) fields.
+        (while (and (not (bobp))
+                    (get-text-property (1- (point)) 'compilation-multiline))
+          (forward-line -1))
         (with-silent-modifications
           (compilation--parse-region (point) compilation--parsed)))))
   nil)