[Emacs-diffs] /srv/bzr/emacs/trunk r105529: * lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):

[Juri Linkov]

------------------------------------------------------------
revno: 105529
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Mon 2011-08-22 15:46:45 +0300
message:
  * lisp/progmodes/compile.el (compilation-mode-font-lock-keywords):
  Revert regexp that highlights output switches to its old
  pre-2010-10-28 value and remove one `?' from it (bug#9319).
modified:
  etc/compilation.txt
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'etc/compilation.txt'
--- a/etc/compilation.txt       2011-07-12 19:39:01 +0000
+++ b/etc/compilation.txt       2011-08-22 12:46:45 +0000
@@ -546,9 +546,18 @@
 checking whether -lc should be explicitly linked in... (cached) no
 checking For GLIB - version >= 2.0.0... yes (version 2.1.0)
 checking FONTCONFIG_CFLAGS...
-g++ -o foo.o foo.cc
-tool1 -output=foo foo.x
-tool2 --outfile foo foo.y
+tool -o foo.o foo.c
+tool -o=foo.o foo.c
+tool -output foo.o foo.c
+tool -output=foo.o foo.c
+tool -outfile foo.o foo.c
+tool -outfile=foo.o foo.c
+tool --output foo.o foo.c
+tool --output=foo.o foo.c
+tool --outfile foo.o foo.c
+tool --outfile=foo.o foo.c
+tool --omega foo.c
+tool --output-html-file foo.c
 
 Compilation started at Wed Jul 20 12:20:10
 Compilation interrupt at Wed Jul 20 12:20:10

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-22 09:54:38 +0000
+++ b/lisp/ChangeLog    2011-08-22 12:46:45 +0000
@@ -1,5 +1,9 @@
 2011-08-22  Juri Linkov  <address@hidden>
 
+       * progmodes/compile.el (compilation-mode-font-lock-keywords):
+       Revert regexp that highlights output switches to its old
+       pre-2010-10-28 value and remove one `?' from it (bug#9319).
+
        * progmodes/grep.el (grep-process-setup): Use `buffer-modified-p'
        to check for empty output (bug#9226).
 

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2011-08-21 02:24:07 +0000
+++ b/lisp/progmodes/compile.el 2011-08-22 12:46:45 +0000
@@ -523,7 +523,7 @@
      ;; Command output lines.  Recognize `make[n]:' lines too.
      ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
-     (" -\\(?:o[= ]?\\|-\\(?:outfile\\|output\\)[= ]\\)\\(\\S +\\)" . 1)
+     (" --?o\\(?:utfile\\|utput\\)?[= ]\\(\\S +\\)" . 1)
      ("^Compilation \\(finished\\).*"
       (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face))