[Emacs-diffs] /srv/bzr/emacs/trunk r110041: In compilation-error-regexp-alist, allow more HIGHLIGHT types.

[Chong Yidong]

------------------------------------------------------------
revno: 110041
fixes bug: http://debbugs.gnu.org/12136
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-09-16 12:16:51 +0800
message:
  In compilation-error-regexp-alist, allow more HIGHLIGHT types.
  
  * progmodes/compile.el (compilation-parse-errors): Apply any value
  that is a valid font-lock-face property.
  (compilation-error-regexp-alist): Doc fix.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-15 20:00:45 +0000
+++ b/lisp/ChangeLog    2012-09-16 04:16:51 +0000
@@ -1,3 +1,9 @@
+2012-09-16  Chong Yidong  <address@hidden>
+
+       * progmodes/compile.el (compilation-parse-errors): Apply any value
+       that is a valid font-lock-face property (Bug#12136).
+       (compilation-error-regexp-alist): Doc fix.
+
 2012-09-15  Glenn Morris  <address@hidden>
 
        * version.el (emacs-bzr-version-bzr): New function.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2012-08-30 08:22:24 +0000
+++ b/lisp/progmodes/compile.el 2012-09-16 04:16:51 +0000
@@ -488,9 +488,10 @@
 `compilation-message-face' applied.  If this is nil, the text
 matched by the whole REGEXP becomes the hyperlink.
 
-Additional HIGHLIGHTs take the shape (SUBMATCH FACE), where SUBMATCH is
-the number of a submatch that should be highlighted when it matches,
-and FACE is an expression returning the face to use for that submatch.."
+Additional HIGHLIGHTs take the shape (SUBMATCH FACE), where
+SUBMATCH is the number of a submatch and FACE is an expression
+which evaluates to a face (more precisely, a valid value for the
+`font-lock-face' property) for highlighting the submatch."
   :type '(repeat (choice (symbol :tag "Predefined symbol")
                         (sexp :tag "Error specification")))
   :link `(file-link :tag "example file"
@@ -1334,7 +1335,9 @@
                   (let ((face (eval (car extra-item))))
                     (cond
                      ((null face))
-                     ((symbolp face)
+                     ((or (symbolp face)
+                         (stringp face)
+                         (listp face))
                       (put-text-property
                        (match-beginning mn) (match-end mn)
                        'font-lock-face face))