[Emacs-diffs] trunk r114550: * lisp/progmodes/compile.el (compilation-parse-errors):

[Stefan Monnier]

------------------------------------------------------------
revno: 114550
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-10-07 01:15:48 -0400
message:
  * lisp/progmodes/compile.el (compilation-parse-errors):
  Use compilation--put-prop.
  (compilation--ensure-parse): Check compilation-multiline.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/progmodes/compile.el      compile.el-20091113204419-o5vbwnq5f7feedwu-126

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-07 05:13:51 +0000
+++ b/lisp/ChangeLog    2013-10-07 05:15:48 +0000
@@ -1,5 +1,9 @@
 2013-10-07  Stefan Monnier  <address@hidden>
 
+       * 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.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2013-10-02 23:33:48 +0000
+++ b/lisp/progmodes/compile.el 2013-10-07 05:15:48 +0000
@@ -1354,9 +1354,7 @@
                           (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 @@
         (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)