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

Merge pull request #1614 from RaiKoHoff/DevNewFeatures

Browse Source 
If AutoCompl. is chosen, only show corresponding word list(s) on Ctrl+Alt-Enter
This commit is contained in:
Rainer Kottenhoff 2019-09-08 16:15:46 +02:00 committed by GitHub
commit 013297fa76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Edit.c
View File

@ -6934,7 +6934,7 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert)
PWLIST pListHead = NULL;
if (Settings.AutoCompleteWords || autoInsert)
if (Settings.AutoCompleteWords || (autoInsert && !Settings.AutoCLexerKeyWords))
{
struct Sci_TextToFind ft = { { 0, 0 }, 0, { 0, 0 } };
ft.lpstrText = pRoot;
@ -6977,7 +6977,7 @@ bool EditAutoCompleteWord(HWND hwnd, bool autoInsert)
if (pwlNewWord) { FreeMem(pwlNewWord); pwlNewWord = NULL; }
}
// --------------------------------------------------------------------------
if (Settings.AutoCLexerKeyWords || autoInsert)
if (Settings.AutoCLexerKeyWords || (autoInsert && !Settings.AutoCompleteWords))
// --------------------------------------------------------------------------
{
PKEYWORDLIST const pKeyWordList = Style_GetCurrentLexerPtr()->pKeyWords;