From 2b780ca53f10ecf514fe962088dd64054c2f8f61 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Thu, 22 Jan 2015 12:31:05 +1100
Subject: Feature [feature-requests:#1098]. Accept `is`/`us` integer suffixes
 instead of `i`/`u`. From Mika Attila.

---
 doc/ScintillaHistory.html | 14 ++++++++++++++
 lexers/LexRust.cxx        |  4 +++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 5fb8eb4b1..9fe18dcf6 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -465,6 +465,8 @@
 	<td>Yusuf Ramazan Karagöz</td>
 	<td>Markus Heidelberg</td>
 	<td>Joe Mueller</td>
+      </tr><tr>
+	<td>Mika Attila</td>
     </tr>
     </table>
     <p>
@@ -479,6 +481,18 @@
     <h3>
        <a href="http://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a>
     </h3>
+    <ul>
+	<li>
+	Released 20 January 2015.
+	</li>
+	<li>
+	Rust lexer accepts new 'is'/'us' integer suffixes instead of 'i'/'u'.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1098/">Bug #1098</a>.
+	</li>
+    </ul>
+    <h3>
+       <a href="http://prdownloads.sourceforge.net/scintilla/scite353.zip?download">Release 3.5.3</a>
+    </h3>
     <ul>
 	<li>
 	Released 20 January 2015.
diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx
index 3b1201c7f..80ec014ca 100644
--- a/lexers/LexRust.cxx
+++ b/lexers/LexRust.cxx
@@ -271,7 +271,7 @@ static void ScanNumber(Accessor& styler, int& pos) {
 		pos++;
 		c = styler.SafeGetCharAt(pos, '\0');
 		n = styler.SafeGetCharAt(pos + 1, '\0');
-		if (c == '8') {
+		if (c == '8' || c == 's') {
 			pos++;
 		} else if (c == '1' && n == '6') {
 			pos += 2;
@@ -279,6 +279,8 @@ static void ScanNumber(Accessor& styler, int& pos) {
 			pos += 2;
 		} else if (c == '6' && n == '4') {
 			pos += 2;
+		} else {
+			error = true;
 		}
 	/* See if it's a floating point literal. These literals have to be base 10.
 	 */
-- 
cgit v1.2.3