aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--doc/ScintillaHistory.html6
-rw-r--r--lexers/LexRust.cxx2
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index c561521c9..b31856873 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -486,6 +486,8 @@
<td>Johannes Sasongko</td>
<td>fstirlitz</td>
<td>Robin Haberkorn</td>
+ </tr><tr>
+ <td>Pavel Sountsov</td>
</tr>
</table>
<p>
@@ -513,6 +515,10 @@
This is for Python 3.5.
</li>
<li>
+ The Rust lexer allows '?' as an operator.
+ <a href="http://sourceforge.net/p/scintilla/feature-requests/1146/">Feature #1146.</a>
+ </li>
+ <li>
Doubled size of compiled regex buffer.
<a href="http://sourceforge.net/p/scintilla/bugs/1822/">Bug #1822</a>.
</li>
diff --git a/lexers/LexRust.cxx b/lexers/LexRust.cxx
index 0d40de2cf..a834e32f4 100644
--- a/lexers/LexRust.cxx
+++ b/lexers/LexRust.cxx
@@ -339,7 +339,7 @@ static bool IsOneCharOperator(int c) {
|| c == '*' || c == '/' || c == '^' || c == '%'
|| c == '.' || c == ':' || c == '!' || c == '<'
|| c == '>' || c == '=' || c == '-' || c == '&'
- || c == '|' || c == '$';
+ || c == '|' || c == '$' || c == '?';
}
static bool IsTwoCharOperator(int c, int n) {