From a4fe8bd8aa80d91f3fc356cb4284b30d8c602d97 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 17 Oct 2013 09:45:03 +1100
Subject: Bug [#1538]. PP-line comments lost from EOL string. From Alpha.

---
 doc/ScintillaHistory.html | 12 ++++++++++++
 lexers/LexCPP.cxx         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index b54522bc7..98debdbb5 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -443,6 +443,18 @@
         Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
       </li>
     </ul>
+    <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite337.zip?download">Release 3.3.7</a>
+    </h3>
+    <ul>
+	<li>
+	Released 15 October 2013.
+	</li>
+	<li>
+	C++ lexer fixes bug with #include statements without " or &gt; terminating filename.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1538/">Bug #1538</a>.
+	</li>
+    <ul>
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite336.zip?download">Release 3.3.6</a>
     </h3>
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index 6f7afc23d..edf415ca4 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -685,7 +685,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
 					if (IsASpace(sc.ch)) {
 						sc.SetState(SCE_C_DEFAULT|activitySet);
 					}
-				} else if (isStringInPreprocessor && (sc.Match('>') || sc.Match('\"'))) {
+				} else if (isStringInPreprocessor && (sc.Match('>') || sc.Match('\"') || sc.atLineEnd)) {
 					isStringInPreprocessor = false;
 				} else if (!isStringInPreprocessor) {
 					if ((isIncludePreprocessor && sc.Match('<')) || sc.Match('\"')) {
-- 
cgit v1.2.3