From 918551c28d2d44aa5a18bc1cd520ab2e365325ec Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 17 Oct 2018 09:04:33 +1100
Subject: Backport: Bug [#2051]. Correct return value from SCI_MARKERADD for
 invalid lines.

Backport of changeset 7117:0cbbfacbf008.
---
 doc/ScintillaHistory.html | 12 ++++++++----
 src/Document.cxx          |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 4fc11a533..8f4cc6386 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -556,14 +556,14 @@
 	with UTF-32 or UTF-16 components.
 	</li>
 	<li>
-	Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
-	still remaining responsive.
-	</li>
-	<li>
 	Lexers added for SAS and Stata.
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1185/">Feature #1185.</a>
 	</li>
 	<li>
+	Improve efficiency of idle wrapping by wrapping in blocks as large as possible while
+	still remaining responsive.
+	</li>
+	<li>
 	C++ lexer fixes evaluation of "#elif".
 	<a href="https://sourceforge.net/p/scintilla/bugs/2045/">Bug #2045</a>.
 	</li>
@@ -571,6 +571,10 @@
 	Markdown lexer fixes highlighting of non-ASCII characters in links.
 	</li>
 	<li>
+	SCI_MARKERADD returns -1 for invalid lines as documented instead of 0.
+	<a href="https://sourceforge.net/p/scintilla/bugs/2051/">Bug #2051</a>.
+	</li>
+	<li>
 	Shell folder folds "if", "do", and "case".
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1144/">Feature #1144.</a>
 	</li>
diff --git a/src/Document.cxx b/src/Document.cxx
index 3eb2dfc4f..b6b1ce294 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -325,7 +325,7 @@ int Document::AddMark(Sci::Line line, int markerNum) {
 		NotifyModified(mh);
 		return prev;
 	} else {
-		return 0;
+		return -1;
 	}
 }
 
-- 
cgit v1.2.3