Commit Graph

6374 Commits

Author SHA1 Message Date
Rainer Kottenhoff
e2487e3891 + fix: behavior of replace (dialog) in case of multi-line selection 2018-12-06 17:52:52 +01:00
Rainer Kottenhoff
e070478f0d + chg: Nim syntax highlighting close to official Nim site code example highligthting 2018-12-06 13:03:38 +01:00
Rainer Kottenhoff
f55a70bca4 + NimLexer keyword corrections 2018-12-06 11:55:52 +01:00
Rainer Kottenhoff
cbb585c3d4
Merge pull request #854 from RaiKoHoff/Dev_NewFeatures
Merge bugfixes for release
2018-12-06 03:48:38 +01:00
Rainer Kottenhoff
f71a30d336 + fix: merge conflict 2018-12-06 03:47:15 +01:00
Rainer Kottenhoff
11315b7207 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
#	src/Notepad3.c
2018-12-06 03:46:46 +01:00
Rainer Kottenhoff
84c49a600f
Merge pull request #853 from RaiKoHoff/Dev_Fix4Releases
Update changelog
2018-12-06 03:30:29 +01:00
Rainer Kottenhoff
5a6ad071e0 + upd: changelog 2018-12-06 03:28:46 +01:00
Rainer Kottenhoff
af466c587f
Merge pull request #852 from RaiKoHoff/Dev_Fix4Releases
Fix for replace dialog
2018-12-06 03:27:29 +01:00
Rainer Kottenhoff
cf80dca476 + fix: tmp disable "mark all occ" in case of multi-line selection 2018-12-06 03:14:17 +01:00
Rainer Kottenhoff
9ca9e305f3 + fix: handling of some settings default values 2018-12-06 02:04:41 +01:00
Rainer Kottenhoff
0e5145f7a0
Merge pull request #851 from RaiKoHoff/Dev_Fix4Releases
UTF-8 affinity initial default settings
2018-12-05 15:58:56 +01:00
Rainer Kottenhoff
7d06abb8e7 + chg: UTF-8 affine initial default settings 2018-12-05 15:46:40 +01:00
Rainer Kottenhoff
79fe92e3d0 + upd: merge current Scintilla dev stage 2018-12-05 09:40:12 +01:00
Rainer Kottenhoff
66ab3945ea Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_NewFeatures
# Conflicts:
#	language/common_res.rc
2018-12-05 09:38:28 +01:00
Rainer Kottenhoff
cd4770728b
Merge pull request #850 from RaiKoHoff/Dev_Fix4Releases
Chnages: ESC behavior and pre-selected search pattern
2018-12-05 09:17:23 +01:00
Rainer Kottenhoff
0d53ea5115 + fix: don't exit Notepad on ESC (if activated), if only canceling ToolTip or AutoCompletion is intended
+ chg: update changelog
2018-12-05 08:51:16 +01:00
Rainer Kottenhoff
057165ec14 + chg: Open FInd/Replace: use most recent find pattern instead of clipboard (if selection is empty) 2018-12-05 08:04:08 +01:00
Pairi Daiza
eb8c6c8ddf
Merge pull request #849 from hpwamr/MUI_dev
MUI - craigo- broken link in About dialog #848
2018-12-04 20:15:37 +01:00
Pairi Daiza
66feae393c MUI - craigo- broken link in About dialog #848 2018-12-04 20:03:51 +01:00
Rainer Kottenhoff
77c5d4cb05 Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures 2018-12-03 15:58:05 +01:00
Rainer Kottenhoff
f060bc411a
Merge pull request #847 from RaiKoHoff/Dev_Fix4Releases
Bug fixing
2018-12-03 15:57:28 +01:00
Rainer Kottenhoff
cb17ec9f4d + chg: if activated, ESC will close/minimize program immediately w/o canceling selection/tooltip first. 2018-12-03 15:25:29 +01:00
Rainer Kottenhoff
8bec8b1890 + fix: problem with bad brace highlighting (indicator) 2018-12-03 12:26:28 +01:00
Rainer Kottenhoff
575515b540
Merge pull request #840 from RaiKoHoff/Dev_NewFeatures
New Nim lexer
2018-11-29 17:05:05 +01:00
Rainer Kottenhoff
456b5fdf6d + fix: missing src code of Scintilla's Nim lexer 2018-11-29 16:09:18 +01:00
Rainer Kottenhoff
494c753f3d + upd: Scintilla current dev
+ chg: Nimrod lexer replaced by new Nim lexer
2018-11-29 16:00:35 +01:00
Rainer Kottenhoff
f4c70aa29a Merge branch 'Dev_Fix4Releases' into Dev_NewFeatures 2018-11-29 13:29:45 +01:00
Rainer Kottenhoff
25c867cb5b
Merge pull request #839 from RaiKoHoff/Dev_Fix4Releases
Fix: ANSI CodePage detection (CED) - allow also less reliable results
2018-11-29 13:25:35 +01:00
Rainer Kottenhoff
be3c12f9dc + chg: allow also "non reliable" CED detections for file decoding
+ chg: increasing VS version
2018-11-29 12:17:32 +01:00
Rainer Kottenhoff
e2a5093421 Merge branch 'Dev_Fixes4Release_NF' into Dev_NewFeatures
# Conflicts:
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_be_by/dialogs_be_by.rc
#	language/np3_be_by/strings_be_by.rc
#	language/np3_de_de/dialogs_de_de.rc
#	language/np3_en_us/np3_en_us.rc
#	language/np3_es_es/dialogs_es_es.rc
#	language/np3_es_es/strings_es_es.rc
#	language/np3_fr_fr/dialogs_fr_fr.rc
#	language/np3_fr_fr/strings_fr_fr.rc
#	language/np3_ja_jp/dialogs_ja_jp.rc
#	language/np3_ja_jp/strings_ja_jp.rc
#	language/np3_ru_ru/dialogs_ru_ru.rc
#	language/np3_ru_ru/strings_ru_ru.rc
#	language/np3_zh_cn/dialogs_zh_cn.rc
#	language/np3_zh_cn/menu_zh_cn.rc
#	language/np3_zh_cn/strings_zh_cn.rc
2018-11-29 09:53:36 +01:00
Rainer Kottenhoff
7679548f07 Merge remote-tracking branch 'notepad3_orig_rizone/master' into Dev_Fixes4Release 2018-11-29 07:37:10 +01:00
Rainer Kottenhoff
f287d041dc + chg: use unreliable compact encoding detection 2018-11-29 07:36:18 +01:00
Pairi Daiza
47c55484d1
Merge pull request #838 from hpwamr/MUI_dev
+ MUI convert resource encoding to local ANSI code-page to get rid of…
2018-11-28 20:17:40 +01:00
Pairi Daiza
f4d15a375b + MUI convert resource encoding to local ANSI code-page to get rid of UTF-8 decoding artefacts - until MS fixes that 2018-11-28 20:09:29 +01:00
Rainer Kottenhoff
3c492b8d00
Merge pull request #837 from RaiKoHoff/Dev_Fixes4Release
ANSI Local Code-Page encoding for resources
2018-11-28 14:08:57 +01:00
Rainer Kottenhoff
369a837ab6 + convert resource encoding to local ANSI code-page to get rid of UTF-8 decoding artefacts - until MS fixes that 2018-11-28 13:57:31 +01:00
Pairi Daiza
d27d0b5df7
Merge pull request #836 from hpwamr/MUI_dev
+ MUI - Converting Resources files '*.rc" from "UTF-8" to "UTF-8 Sign…
2018-11-28 00:11:41 +01:00
Pairi Daiza
ae1d3ff3d3 + MUI - Converting Resources files '*.rc" from "UTF-8" to "UTF-8 Signature" 2018-11-27 23:37:46 +01:00
Rainer Kottenhoff
98023acfa1 Merge branch 'Dev_Fixes4Release' into Dev_NewFeatures
# Conflicts:
#	language/np3_af_za/dialogs_af_za.rc
#	language/np3_en_us/dialogs_en_us.rc
#	src/Dialogs.c
#	src/Styles.c
2018-11-26 10:39:33 +01:00
Pairi Daiza
1ae8cb87e1
Merge pull request #834 from hpwamr/MUI_dev
+ MUI - ja-JP Correction typo
2018-11-26 05:59:48 +01:00
Pairi Daiza
4473f50fdb + MUI - ja-JP Correction typo 2018-11-26 05:58:47 +01:00
Pairi Daiza
be11fd2cf7
Merge pull request #833 from maboroshin/master
Translation >JP :New command line
2018-11-26 04:37:45 +01:00
maboroshin
2a525940a4 Translation >JP :New command line 2018-11-26 12:24:00 +09:00
Pairi Daiza
28cd679152
Merge pull request #831 from hpwamr/MUI_dev
+ MUI - be-BY Workaround fix to resolve display
2018-11-23 17:49:09 +01:00
Pairi Daiza
e48449df0d + MUI - be-BY Workaround fix to resolve display 2018-11-23 17:36:46 +01:00
Derick Payne
ea4c716fbd Merge branch 'master' of https://github.com/rizonesoft/Notepad3 2018-11-23 15:43:19 +02:00
Derick Payne
2e2e22d304 Starting Afrikaans Translation 2018-11-23 15:43:10 +02:00
Pairi Daiza
aa41cf403c
Merge pull request #830 from alexantr/be-ru
be-BY & ru-RU: misc. updates and typo fixes
2018-11-23 09:19:37 +01:00
Alex Yashkin
f014f05c35
be-BY & ru-RU: misc. updates and typo fixes 2018-11-23 09:44:40 +03:00