From 56ee679c7f363b2ea9caf070535c0696a3af7b66 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Mon, 22 Aug 2011 15:46:45 +0300 Subject: [PATCH] * 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). --- etc/compilation.txt | 15 ++++++++++++--- lisp/ChangeLog | 4 ++++ lisp/progmodes/compile.el | 2 +- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/etc/compilation.txt b/etc/compilation.txt index 888c1f94c3..2e452b58c8 100644 --- a/etc/compilation.txt +++ b/etc/compilation.txt @@ -546,9 +546,18 @@ checking whether to build shared libraries... yes 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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bfcbaa27b6..4c7306174d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,9 @@ 2011-08-22 Juri Linkov + * 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). diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 2fb0ac879b..79fec080d5 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -523,7 +523,7 @@ you may also want to change `compilation-page-delimiter'.") ;; 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)) -- 2.20.1