CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source
This commit is contained in:
Rainer Kottenhoff 2017-10-30 10:25:41 +01:00
commit 141fcd5dcf
7 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scintilla/doc/ScintillaDoc.html
View File

@ -2900,7 +2900,8 @@ struct Sci_TextToFind {
number used by the C and C++ lexer to display literal strings; it has the value 6). This
feature works differently on Windows and GTK+.<br />
The default character set is <code>SC_CHARSET_DEFAULT</code>.</p>
<p><code>SC_CHARSET_ANSI</code> and <code>SC_CHARSET_DEFAULT</code> specify European Windows code page 1252 unless the code page is set.</p>
<p><code>SC_CHARSET_ANSI</code> specifies European Windows code page 1252.</p>
<p><code>SC_CHARSET_DEFAULT</code> specifies the system-default code page unless the code page is set.</p>
<table class="standard" summary="Character Sets supported"><tbody>
<tr>
@ -6615,6 +6616,10 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
<a class="message" href="#SCI_GETPRIMARYSTYLEFROMSTYLE">SCI_GETPRIMARYSTYLEFROMSTYLE(int style) &rarr; int</a><br />
<a class="message" href="#SCI_SETIDENTIFIERS">SCI_SETIDENTIFIERS(int style, const char *identifiers)</a><br />
<a class="message" href="#SCI_PRIVATELEXERCALL">SCI_PRIVATELEXERCALL(int operation, int pointer) &rarr; int</a><br />
<a class="message" href="#SCI_GETNAMEDSTYLES">SCI_GETNAMEDSTYLES &rarr; int</a><br />
<a class="message" href="#SCI_NAMEOFSTYLE">SCI_NAMEOFSTYLE(int style, char *name) &rarr; int</a><br />
<a class="message" href="#SCI_TAGSOFSTYLE">SCI_TAGSOFSTYLE(int style, char *tags) &rarr; int</a><br />
<a class="message" href="#SCI_DESCRIPTIONOFSTYLE">SCI_DESCRIPTIONOFSTYLE(int style, char *description) &rarr; int</a><br />
<p><b id="SCI_SETLEXER">SCI_SETLEXER(int lexer)</b><br />
<b id="SCI_GETLEXER">SCI_GETLEXER &rarr; int</b><br />
@ -6792,6 +6797,23 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
<p><b id="SCI_PRIVATELEXERCALL">SCI_PRIVATELEXERCALL(int operation, int pointer) &rarr; int</b><br />
Call into a lexer in a way not understood by Scintilla.</p>
<h3 id="StyleMetadata">Style Metadata</h3>
<p>Lexers may provide information on the styles they use.
Lexers have to explicitly support this feature by implementing particular methods.</p>
<p><b id="SCI_GETNAMEDSTYLES">SCI_GETNAMEDSTYLES &rarr; int</b><br />
Retrieve the number of named styles for the lexer.</p>
<p><b id="SCI_NAMEOFSTYLE">SCI_NAMEOFSTYLE(int style, char *name) &rarr; int</b><br />
Retrieve the name of a style. This is a C preprocessor symbol like "SCE_C_COMMENTDOC".</p>
<p><b id="SCI_TAGSOFSTYLE">SCI_TAGSOFSTYLE(int style, char *tags) &rarr; int</b><br />
Retrieve the tags of a style. This is a space-separated set of words like "comment documentation".</p>
<p><b id="SCI_DESCRIPTIONOFSTYLE">SCI_DESCRIPTIONOFSTYLE(int style, char *description) &rarr; int</b><br />
Retrieve an English-language description of a style which may be suitable for display in a user interface.
This looks like "Doc comment: block comments beginning with /** or /*!".</p>
<h2 id="LexerObjects">Lexer Objects</h2>
<p>Lexers are programmed as objects that implement the ILexer4 interface and that interact

10
scintilla/doc/ScintillaDownload.html
View File

@ -26,9 +26,9 @@
<table bgcolor="#CCCCCC" width="100%" cellspacing="0" cellpadding="8" border="0">
<tr>
<td>
<font size="4"> <a href="http://www.scintilla.org/scintilla401.zip">
<font size="4"> <a href="http://www.scintilla.org/scintilla402.zip">
Windows</a>&nbsp;&nbsp;
<a href="http://www.scintilla.org/scintilla401.tgz">
<a href="http://www.scintilla.org/scintilla402.tgz">
GTK+/Linux</a>&nbsp;&nbsp;
</font>
</td>
@ -42,7 +42,7 @@
containing very few restrictions.
</p>
<h3>
Release 4.0.1
Release 4.0.2
</h3>
<h4>
Source Code
@ -50,8 +50,8 @@
The source code package contains all of the source code for Scintilla but no binary
executable code and is available in
<ul>
<li><a href="http://www.scintilla.org/scintilla401.zip">zip format</a> (1600K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla401.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
<li><a href="http://www.scintilla.org/scintilla402.zip">zip format</a> (1600K) commonly used on Windows</li>
<li><a href="http://www.scintilla.org/scintilla402.tgz">tgz format</a> (1400K) commonly used on Linux and compatible operating systems</li>
</ul>
Instructions for building on both Windows and Linux are included in the readme file.
<h4>

23
scintilla/doc/ScintillaHistory.html
View File

@ -526,6 +526,26 @@
Icons</a> Copyright(C) 1998 by Dean S. Jones<br />
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite402.zip">Release 4.0.2</a>
</h3>
<ul>
<li>
Released 26 October 2017.
</li>
<li>
Fix HTML lexer handling of Django so that nesting a &#123;&#123; &#125;&#125; or &#123;% %&#125;
Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
</li>
<li>
Fix failure on Cocoa with animated find indicator in large files with macOS 10.13
by disabling animation on 10.13.
</li>
<li>
Fix Cocoa hang when Scintilla loaded from SMB share on macOS 10.13.
<a href="http://sourceforge.net/p/scintilla/bugs/1979/">Bug #1979</a>.
</li>
</ul>
<h3>
<a href="http://www.scintilla.org/scite401.zip">Release 4.0.1</a>
</h3>
@ -812,7 +832,7 @@
</li>
<li>
SciTE on Windows Find strip Find button works in incremental no-close mode.
<a href="http://sourceforge.net/p/scintilla/bugs/1926/">Bug #1926</a>.
<href="http://sourceforge.net/p/scintilla/bugs/1926/">Bug #1926</a>.
</li>
</ul>
<h3>
@ -1236,6 +1256,7 @@
This prevents unexpected behaviour and crashes on East Asian systems where default locales are commonly DBCS.
Projects which want to default to DBCS code pages in East Asian locales should set the code page and
character set explicitly.
<b> (This change has been REVERTED in Notepad3) </b>
</li>
<li>
SCVS_NOWRAPLINESTART option stops left arrow from wrapping to the previous line.

7
scintilla/doc/index.html
View File

@ -9,7 +9,7 @@
<meta name="keywords" content="Scintilla, SciTE, Editing Component, Text Editor" />
<meta name="Description"
content="www.scintilla.org is the home of the Scintilla editing component and SciTE text editor application." />
<meta name="Date.Modified" content="20171023" />
<meta name="Date.Modified" content="20171026" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
#versionlist {
@ -56,8 +56,8 @@
GTK+, and OS X</font>
</td>
<td width="40%" align="right">
<font color="#FFCC99" size="3"> Release version 4.0.1<br />
Site last modified October 23 2017</font>
<font color="#FFCC99" size="3"> Release version 4.0.2<br />
Site last modified October 26 2017</font>
</td>
<td width="20%">
&nbsp;
@ -72,6 +72,7 @@
</tr>
</table>
<ul id="versionlist">
<li>Version 4.0.2 fixes some bugs on macOS 10.13.</li>
<li>Version 4.0.1 makes some changes to namespaces and headers. Scrolling is smoother on Cocoa.</li>
<li>Version 4.0.0 is an unstable major release with changes to some internal and external interfaces.</li>
<li>Version 3.7.6 was a minor long term release.</li>

2
scintilla/lexers/LexHTML.cxx
View File

@ -1015,7 +1015,7 @@ static void ColouriseHyperTextDoc(Sci_PositionU startPos, Sci_Position length, i
}
// handle the start Django template code
else if (isDjango && scriptLanguage != eScriptPython && (ch == '{' && (chNext == '%' || chNext == '{'))) {
else if (isDjango && scriptLanguage != eScriptPython && scriptLanguage != eScriptComment && (ch == '{' && (chNext == '%' || chNext == '{'))) {
if (chNext == '%')
StringCopy(djangoBlockType, "%");
else

2
scintilla/version.txt
View File

@ -1 +1 @@
401
402

2
src/Edit.c
View File

@ -4946,7 +4946,7 @@ int __fastcall EditGetFindStrg(HWND hwnd, LPCEDITFINDREPLACE lpefr, LPSTR szFind
if (lpefr->bTransformBS)
TransformBackslashes(szFind, (lpefr->fuFlags & SCFIND_REGEXP), Encoding_SciGetCodePage(hwnd));
int slen = StringCchLenA(szFind, COUNTOF(szFind));
int slen = StringCchLenA(szFind, FNDRPL_BUFFER);
if (slen == 0)
InfoBox(0, L"MsgNotFound", IDS_NOTFOUND);