From 0604389a02a2cb5f33f5f84e460ad3d7a55f1fc4 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 29 Mar 2016 15:38:45 +1100
Subject: Feature [feature-requests:#1142]. Allow Super modifier on GTK+.

---
 doc/ScintillaDoc.html     | 4 +++-
 doc/ScintillaHistory.html | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index b1b550fb0..f1e6c3a75 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -5042,9 +5042,11 @@ struct Sci_TextToFind {
     <code>SCK_WIN</code>.</p>
 
     <p>The modifiers are a combination of zero or more of <code>SCMOD_ALT</code>,
-    <code>SCMOD_CTRL</code>, <code>SCMOD_SHIFT</code>, and <code>SCMOD_META</code>.
+    <code>SCMOD_CTRL</code>, <code>SCMOD_SHIFT</code>,
+    <code>SCMOD_META</code>, and <code>SCMOD_SUPER</code>.
     On OS X, the Command key is mapped to <code>SCMOD_CTRL</code> and the Control key to
     <code>SCMOD_META</code>.
+    <code>SCMOD_SUPER</code> is only available on GTK+ which is commonly the Windows key.
     If you are building a table, you might
     want to use <code>SCMOD_NORM</code>, which has the value 0, to mean no modifiers.</p>
 
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 71886307e..a3e725230 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -484,6 +484,7 @@
       </tr><tr>
 	<td>Mark C</td>
 	<td>Johannes Sasongko</td>
+	<td>fstirlitz</td>
     </tr>
     </table>
     <p>
@@ -515,6 +516,10 @@
 	<a href="http://sourceforge.net/p/scintilla/bugs/1822/">Bug #1822</a>.
 	</li>
 	<li>
+	For GTK+, the Super modifier key can be used in key bindings.
+	<a href="http://sourceforge.net/p/scintilla/feature-requests/1142/">Feature #1142.</a>
+	</li>
+	<li>
 	SciTE bug fixed with exported HTML where extra line shown.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1816/">Bug #1816</a>.
 	</li>
-- 
cgit v1.2.3