[lmi-commits] [lmi] odd/multiarch 9827c4a 1/5: Merge remote-tracking branch 'origin/master' into odd/multiarch

[Greg Chicares]

branch: odd/multiarch
commit 9827c4a7c3639a65da7f1a2334215be1097bcc8e
Merge: c912adf aea8ef1
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge remote-tracking branch 'origin/master' into odd/multiarch
---
 fenv_lmi_test.cpp     | 2 +-
 gwc/.vimrc            | 4 ++++
 test_coding_rules.cpp | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fenv_lmi_test.cpp b/fenv_lmi_test.cpp
index ca3c9fa..cec9c53 100644
--- a/fenv_lmi_test.cpp
+++ b/fenv_lmi_test.cpp
@@ -23,7 +23,7 @@
 
 // Include this first, in order to get the prototype for nonstandard
 // _control87() before any other header can include <float.h>.
-// CYGWIN !! For cygwin with '-mno-cygwin', that doesn't work quite
+// Historically, for cygwin with '-mno-cygwin', that didn't work quite
 // the same way as it does for MinGW:
 //   http://cygwin.com/ml/cygwin/2005-03/msg00752.html
 //   http://cygwin.com/ml/cygwin/2006-08/msg00521.html
diff --git a/gwc/.vimrc b/gwc/.vimrc
index d768f3c..d8bc426 100644
--- a/gwc/.vimrc
+++ b/gwc/.vimrc
@@ -55,6 +55,10 @@ set history=1000
 set virtualedit=all
 
 set background=dark
+
+" Make comments less prominent
+highlight Comment                                ctermfg=39
+
 highlight clear SpellBad
 highlight SpellBad   cterm=underline ctermbg=240 ctermfg=226
 highlight clear SpellCap
diff --git a/test_coding_rules.cpp b/test_coding_rules.cpp
index a5ec9b6..68b1962 100644
--- a/test_coding_rules.cpp
+++ b/test_coding_rules.cpp
@@ -694,7 +694,6 @@ void check_defect_markers(file const& f)
             &&  "BOOST "       != z[1]
             &&  "COMPILER "    != z[1]
             &&  "CURRENCY "    != z[1]
-            &&  "CYGWIN "      != z[1]
             &&  "DATABASE "    != z[1]
             &&  "DBO3 "        != z[1]
             &&  "ET "          != z[1]