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 Packages Projects Releases Wiki Activity

Merge branch 'RC2_DEV' into NewFeatures

Browse Source
This commit is contained in:
RaiKoHoff 2020-03-17 11:07:54 +01:00
commit ca3c946e51
30 changed files with 59 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Build/Changes.txt
View File

@ -31,14 +31,14 @@ UCD - (UCD)ARDET is an Encoding Detector Library
=====================================================
Current RC3 Version 5.20.315.(build_#) (2020-03-15)
Current RC3 Version 5.20.316.(build_#) (2020-03-16)
// Version 5.20.3xx.x (xx March 2020)
=====================================================
-----------------------------------------------------
NEW:
-----------------------------------------------------
- remove scaling of Toolbar image for DPI (avoid blurry images)
- Remove scaling of Toolbar image for DPI (avoid blurry images).
- "Open with Notepad3" Right-Click in Explorer Context Menu.
- In About Resources: Data Sharing Service from https://workupload.com/.
- Automatic scrolling when dragging text near window edge.
@ -58,7 +58,7 @@ NEW:
CHANGES:
-----------------------------------------------------
- Update "KeyboardShortcuts.txt".
- Split undo typing sequence by line-breaks default -> true
- Split undo typing sequence by line-breaks default -> true.
- Add file history to to recent docs (taskbar) jumplist.
- NP3 INI file read/write using file locking (shared read / exclusive write) for multiple instances.
- Reset build-of-the-day number in AppVeyor on new day.

8
Build/Docs/KeyboardShortcuts.txt
View File

@ -8,7 +8,7 @@
================================================================================
*** Keyboard Shortcuts *** date: 2020/03/15
*** Keyboard Shortcuts *** date: 2020/03/16
---------------------------------------------------------
@ -21,7 +21,7 @@
Ctrl+S Save file.
F6 Save file as...
Ctrl+F6 Save file Copy...
Ctrl+Alt+F6 Save with Original file &Date/Time.
Ctrl+Alt+F6 Save with Original file "Date/Time".
Ctrl+P Print file...
Ctrl+M Run MiniPath file Browser plugin...
Ctrl+Alt+H Open Recent file (History)...
@ -385,8 +385,8 @@
/b Open new paste board to collect clipboard entries.
/n Always open a new window (/ns single file instance).
/r Reuse window (/rs single file instance).
/p Set window position and size (/p0, /ps, /pf,l,t,r,b,m).
or /p <left>,<top>,<width>,<height>,<max> [all integers]
/p Set window position and size (/p0, /ps, /pf,l,t,r,b,m)
or /p <left>,<top>,<width>,<height>,<max> [all integers].
/t Set window title.
/i Start as tray icon.
/o Keep window on top.

1
Build/notepad3_setup.iss
View File

@ -196,6 +196,7 @@ Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x64_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: Is64BitInstallMode()
Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion; Check: not Is64BitInstallMode()
Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion
Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion

1
Build/notepad3_x86_setup.iss
View File

@ -152,6 +152,7 @@ Source: {#bindir}\Release_x86_v142\lng\sv-SE\np3lng.dll.mui; DestDir: {ap
Source: {#bindir}\Release_x86_v142\lng\zh-CN\mplng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion
Source: {#bindir}\Release_x86_v142\lng\zh-CN\np3lng.dll.mui; DestDir: {app}\lng\zh-CN; Flags: ignoreversion
Source: Docs\KeyboardShortcuts.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Oniguruma_RE.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\Notepad3.txt; DestDir: {app}\Docs; Flags: ignoreversion
Source: Docs\crypto\encryption-doc.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion
Source: Docs\crypto\read_me.txt; DestDir: {app}\Docs\crypto; Flags: ignoreversion

2
Versions/day.txt
View File

@ -1 +1 @@
316
317

3
language/np3_af_za/strings_af_za.rc
View File

@ -277,7 +277,8 @@ Opsies:\r\n\
/b\tMaak 'n nuwe plakbord oop om klipbordinskrywings te versamel.\r\n\
/n\tMaak altyd 'n nuwe venster oop (/ns enkele lêer instansie).\r\n\
/r\tHergebruik venster (/rs enkele lêer instansie).\r\n\
/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tStel venster posisie en grootte (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tStel venster titel.\r\n\
/i\tBegin as tray ikoon.\r\n\
/o\tHou venster bo-op.\r\n\

3
language/np3_be_by/strings_be_by.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[Кадоўка]] [...[Канчаткі радкоў]] [/e]
/b\tАдкрыць новае акно для збірання змяненняў буфера абмену.\r\n\
/n\tЗаўсёды адкрываць новае акно (/ns адзін экзэмпляр файла).\r\n\
/r\tВыкарыстаць былое акно (/rs адзін экзэмпляр файла).\r\n\
/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tЗадаць пазіцыю і памер акна (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tЗадаць назву акна.\r\n\
/i\tЗапусціць значком на паліцы задач.\r\n\
/o\tЗверху іншых вокнаў.\r\n\

3
language/np3_de_de/strings_de_de.rc
View File

@ -277,7 +277,8 @@ Optionen:\r\n\
/b\tÖffne ein neues 'Paste Board' um die Einträge\r\n\tder Zwischenablage zu sammeln.\r\n\
/n\tÖffne immer ein neues Fenster (/ns single file instance).\r\n\
/r\tBenutze geöffnetes Fenster erneut (/rs single file instance).\r\n\
/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSetze Fenster: Position und Größe (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSetze Fenster-Titel.\r\n\
/i\tStarte als 'Tray-Icon'.\r\n\
/o\tHalte Fenster immer auf oberster Ebene.\r\n\

3
language/np3_en_gb/strings_en_gb.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

3
language/np3_en_us/strings_en_us.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

3
language/np3_es_es/strings_es_es.rc
View File

@ -277,7 +277,8 @@ Opciones:\r\n\
/b\tAbre una nueva tabla de pegar para recoger las entradas\r\n\tdel portapapeles.\r\n\
/n\tSiempre abre una nueva ventana (/ns instancia de archivo único).\r\n\
/r\tReutilizar la ventana (/rs instancia de archivo único).\r\n\
/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps,\r\n\t/pf,l,t,r,b,m).\r\n\
/p\tEstablecer el tamaño y la posición de la ventana (/p0, /ps,\r\n\t/pf,l,t,r,b,m)\r\n\
\to /p <izquierda>,<arriba>,<ancho>,<altura>,<max> [todos enteros].\r\n\
/t\tEstablecer el título de la ventana.\r\n\
/i\tComenzar como un icono de la barra de tareas.\r\n\
/o\tVentana siempre visible.\r\n\

3
language/np3_fr_fr/strings_fr_fr.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOuvrir un nouveau tableau de collage pour collecter les entrées\r\n\tdu presse-papiers.\r\n\
/n\tToujours ouvrir une nouvelle fenêtre (/ns instance\r\n\tde fichier unique).\r\n\
/r\tRéutiliser la fenêtre (/rs instance de fichier unique).\r\n\
/p\tDéfinir la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tDéfinir la position et la taille de la fenêtre (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tou /p <gauche>,<haut>,<largeur>,<hauteur>,<max> [tous entiers].\r\n\
/t\tDéfinir un titre de fenêtre.\r\n\
/i\tDémarrer en tant que icône de barre de tâches.\r\n\
/o\tFenêtre toujours visible.\r\n\

3
language/np3_hu_hu/strings_hu_hu.rc
View File

@ -277,7 +277,8 @@ Opciók:\r\n\
/b\tÚj dokumentum megnyitása, ahova a vágólap tartalma gyűlik.\r\n\
/n\tMindig nyisson új ablakot (/ns egyetlen fájl példány).\r\n\
/r\tAblak újrahasznosítása (/rs egyetlen fájl példány).\r\n\
/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tAblak pozíció és méret beállítása (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tCímsor szövegének beállítása.\r\n\
/i\tIndítás óra melé kicsinyítve.\r\n\
/o\tAblak mindig felül.\r\n\

3
language/np3_it_it/strings_it_it.rc
View File

@ -277,7 +277,8 @@ Opzioni:\r\n\
/b\tApri una nuova Paste Board per collezionare il testo copiato negli Appunti.\r\n\
/n\tApri sempre una nuova finestra (/ns istanza singola).\r\n\
/r\tRiutilizza finestra (/rs istanza singola).\r\n\
/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tImposta posizione e dimensione della finestra (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tImposta titolo della finestra.\r\n\
/i\tAvvia come icona nella Tray.\r\n\
/o\tMantieni finestra in primo piano.\r\n\

1
language/np3_ja_jp/strings_ja_jp.rc
View File

@ -278,6 +278,7 @@ Notepad3 \t[/?] [...[文字コード]] [...[改行コード]] [/e] [/g] [/m] [/l
/n\t新しいウィンドウで開く (/ns ファイルは単一のインスタンス)\r\n\
/r\tひとつウインドウを再利用 (/rs 同じく単一のインスタンス\r\n\
/p\tウィンドウの位置とサイズを指定 [/p x,y,sizex,y[,max]] (/p0, /ps,\r\n\t/pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers]\r\n\
/t\tタイトルバーの文字列を指定 [/t text]\r\n\
/i\tシステムトレイ内に起動\r\n\
/o\t常に手前に表示\r\n\

3
language/np3_ko_kr/strings_ko_kr.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[인코딩]] [...[줄 끝 모드]] [/e] [/g] [/m] [/l]\r\n\
/b\t클립보드 항목 수집용 붙여넣기판으로 열기.\r\n\
/n\t항상 새 창 열기 (/ns 단일 파일 인스턴스).\r\n\
/r\t윈도우 다시 사용 (/rs 단일 파일 인스턴스).\r\n\
/p\t윈도우 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\t윈도우 위치와 크기 지정 (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\t윈도우 타이틀 지정.\r\n\
/i\t트레이 아이콘으로 실행.\r\n\
/o\t최상위 창으로.\r\n\

3
language/np3_nl_nl/strings_nl_nl.rc
View File

@ -277,7 +277,8 @@ Opties:\r\n\
/b\tOpen nieuw plakbord om de klemborditems te verzamelen.\r\n\
/n\tOpen altijd een nieuw venster (/ns één bestand instantie).\r\n\
/r\tHergebruik venster (/rs één bestand instantie).\r\n\
/p\tStel vensterpositie en -grootte in (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tStel vensterpositie en -grootte in (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tof /p <links>,<top>,<breedte>,<hoogte>,<max> [alle gehele getallen].\r\n\
/t\tStel de titel van het venster in.\r\n\
/i\tStart als systeemvak icoon.\r\n\
/o\tHoud het venster bovenop.\r\n\

3
language/np3_pl_pl/strings_pl_pl.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

3
language/np3_pt_br/strings_pt_br.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

3
language/np3_ru_ru/strings_ru_ru.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[Кодировка]] [...[Окончания строк]] [
/b\tОткрыть новое окно для сбора изменений буфера обмена.\r\n\
/n\tВсегда открывать новое окно (/ns один экземпляр файла).\r\n\
/r\tПереиспользовать окно (/rs один экземпляр файла).\r\n\
/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tЗадать положение и размер окна (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tЗадать заголовок окна.\r\n\
/i\tЗапустить иконкой в области уведомлений.\r\n\
/o\tПоверх других окон.\r\n\

3
language/np3_sk_sk/strings_sk_sk.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

3
language/np3_sv_se/strings_sv_se.rc
View File

@ -277,7 +277,8 @@ Tillval:\r\n\
/b\tÖppna urklippsbordet för att samla alla urklipp.\r\n\
/n\tÖppna alltid nytt fönster (/ns enkel filinstans).\r\n\
/r\tÅteranvänd fönster (/rs enkel filinstans).\r\n\
/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tAnge fönsterposition och storlek (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tAnge fönstertitel.\r\n\
/i\tStarta som ikon i verktygsfältet.\r\n\
/o\tVisa alltid fönstret överst.\r\n\

3
language/np3_tr_tr/strings_tr_tr.rc
View File

@ -277,7 +277,8 @@ Options:\r\n\
/b\tOpen new paste board to collect clipboard entries.\r\n\
/n\tAlways open a new window (/ns single file instance).\r\n\
/r\tReuse window (/rs single file instance).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m).\r\n\
/p\tSet window position and size (/p0, /ps, /pf,l,t,r,b,m)\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers].\r\n\
/t\tSet window title.\r\n\
/i\tStart as tray icon.\r\n\
/o\tKeep window on top.\r\n\

3
language/np3_zh_cn/strings_zh_cn.rc
View File

@ -277,7 +277,8 @@ Notepad3 \t[/?] [...[编码]] [...[换行符模式]] [/e] [/g] [/m] [/l]\r\n\
/b\t打开剪贴板收集窗口（自动粘贴加入到剪贴板中的内容）。\r\n\
/n\t总是打开新窗口（/ns 对于每个文件只允许打开一个实例）。\r\n\
/r\t重用已存在的窗口（/rs 对于每个文件只允许打开一个实例）。\r\n\
/p\t设置窗口位置和大小（/p0, /ps, /pf,l,t,r,b,m）。\r\n\
/p\t设置窗口位置和大小（/p0, /ps, /pf,l,t,r,b,m）\r\n\
\tor /p <left>,<top>,<width>,<height>,<max> [all integers]。\r\n\
/t\t设置窗口标题。\r\n\
/i\t以托盘图标状态启动。\r\n\
/o\t窗口置顶。\r\n\

1
np3portableapp/build_np3portableapp.cmd
View File

@ -94,6 +94,7 @@ copy "%NP3_DISTRIB_DIR%\License.txt" "%NP3_PORTAPP_DIR%\Other\Help\License.txt"
copy "%NP3_DISTRIB_DIR%\Readme.txt" "%NP3_PORTAPP_DIR%\Other\Help\Readme.txt" /Y /V
copy "%NP3_DOC_DIR%\Notepad3.txt" "%NP3_PORTAPP_DIR%\Other\Help\Notepad3.txt" /Y /V
copy "%NP3_DOC_DIR%\KeyboardShortcuts.txt" "%NP3_PORTAPP_DIR%\Other\Help\KeyboardShortcuts.txt" /Y /V
copy "%NP3_DOC_DIR%\Oniguruma_RE.txt" "%NP3_PORTAPP_DIR%\Other\Help\Oniguruma_RE.txt" /Y /V
copy "%NP3_DOC_DIR%\crypto\encryption-doc.txt" "%NP3_PORTAPP_DIR%\Other\Help\encryption-doc.txt" /Y /V

2
res/Notepad3.exe.manifest.conf
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="5.20.316.1"
version="5.20.317.1"
type="win32"
/>
<description>Notepad3 RC3</description>

9
src/Edit.c
View File

@ -4817,8 +4817,7 @@ void EditEnsureSelectionVisible()
SciCall_EnsureVisible(iAnchorLine);
if (iAnchorLine != iCurrentLine) { SciCall_EnsureVisible(iCurrentLine); }
//SciCall_ScrollCaret();
Sci_ScrollToLine(iCurrentLine);
Sci_ScrollToLine(iCurrentLine, true);
}
@ -4845,7 +4844,7 @@ void EditJumpTo(HWND hwnd, DocLn iNewLine, DocPos iNewCol)
const DocPos iNewPos = SciCall_FindColumn(iNewLine, iNewCol);
SciCall_GotoPos(iNewPos);
Sci_ScrollToLine(iNewLine);
Sci_ScrollToLine(iNewLine, true);
// remember x-pos for moving caret vertically
SciCall_ChooseCaretX();
@ -6976,11 +6975,11 @@ void EditToggleView(HWND hwnd)
EditHideNotMarkedLineRange(hwnd, FocusedView.HideNonMatchedLines);
if (FocusedView.HideNonMatchedLines) {
Sci_ScrollToLine(0);
Sci_ScrollToLine(0, false);
SciCall_SetReadOnly(true);
}
else {
Sci_ScrollToLine(Sci_GetCurrentLineNumber());
Sci_ScrollToLine(Sci_GetCurrentLineNumber(), true);
SciCall_SetReadOnly(false);
}

8
src/Notepad3.c
View File

@ -2912,7 +2912,7 @@ LRESULT MsgChangeNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
if (FileWatching.MonitoringLog)
{
SciCall_SetReadOnly(FileWatching.MonitoringLog);
Sci_ScrollToLine(Sci_GetLastDocLineNumber());
Sci_ScrollToLine(Sci_GetLastDocLineNumber(), false);
}
else {
SciCall_GotoPos(iCurPos);
@ -5233,7 +5233,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
FileWatching.AutoReloadTimeout = 250UL;
UndoRedoRecordingStop();
SciCall_SetEndAtLastLine(false);
Sci_ScrollToLine(Sci_GetLastDocLineNumber());
Sci_ScrollToLine(Sci_GetLastDocLineNumber(), false);
}
else {
s_flagChangeNotify = FileWatching.flagChangeNotify;
@ -5243,7 +5243,7 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
FileWatching.AutoReloadTimeout = Settings2.AutoReloadTimeout;
UndoRedoRecordingStart();
SciCall_SetEndAtLastLine(!Settings.ScrollPastEOF);
Sci_ScrollToLine(Sci_GetCurrentLineNumber());
Sci_ScrollToLine(Sci_GetCurrentLineNumber(), true);
}
InstallFileWatching(Globals.CurrentFile); // force
@ -9645,7 +9645,7 @@ bool FileRevert(LPCWSTR szFileName, bool bIgnoreCmdLnEnc)
if (FileWatching.FileWatchingMode == FWM_AUTORELOAD) {
if (docView.bIsTail || FileWatching.MonitoringLog) {
bPreserveView = false;
Sci_ScrollToLine(Sci_GetLastDocLineNumber());
Sci_ScrollToLine(Sci_GetLastDocLineNumber(), false);
}
}

2
src/SciCall.h
View File

@ -599,7 +599,7 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
}
// respect VSlop settings
#define Sci_ScrollToLine(L) SciCall_ScrollRange(SciCall_GetLineEndPosition(L), SciCall_PositionFromLine(L));
#define Sci_ScrollToLine(L,C) { SciCall_ScrollRange(SciCall_PositionFromLine(L), SciCall_GetLineEndPosition(L)); if (C) { SciCall_ScrollCaret(); } }
#define Sci_ReplaceTarget(M,L,T) (((M) == SCI_REPLACETARGET) ? SciCall_ReplaceTarget((L),(T)) : SciCall_ReplaceTargetRe((L),(T)))

2
src/VersionEx.h
View File

@ -8,7 +8,7 @@
#define SAPPNAME "Notepad3"
#define VERSION_MAJOR 5
#define VERSION_MINOR 20
#define VERSION_REV 316
#define VERSION_REV 317
#define VERSION_BUILD 1
#define SCINTILLA_VER 432
#define ONIGURUMA_REGEX_VER 6.9.4