Commit Graph

4845 Commits

Author SHA1 Message Date
RaiKoHoff
35affe5b95 + fix: setup scripts for changed AppUserModelID 2020-02-21 10:39:42 +01:00
RaiKoHoff
21ca81e126 + rfc: minor refactorings 2020-02-21 10:04:17 +01:00
RaiKoHoff
c745e2a316 Merge remote-tracking branch 'upstream/master' into NewFeatures 2020-02-20 15:40:20 +01:00
Rainer Kottenhoff
cf5475f800
Merge pull request #2007 from RaiKoHoff/RC2
Fix some replacement pattern issues (transform backslashes, etc.)
2020-02-20 15:38:38 +01:00
RaiKoHoff
8fe1536e2e + fix: in case of "Transform BS", swallow single slashes not related to a ctrl-char 2020-02-20 15:29:28 +01:00
RaiKoHoff
cc729d481d + upd: versioning files 2020-02-20 14:57:12 +01:00
RaiKoHoff
21e36e013a + fix: 2nd small issue on regex replacement pattern 2020-02-20 14:55:32 +01:00
RaiKoHoff
3a9253b75f + fix: small issue on regex replacement pattern 2020-02-20 14:21:53 +01:00
RaiKoHoff
be9785bc19 + upd: Oniguruma current dev (2020-02-20) 2020-02-20 11:08:51 +01:00
Rainer Kottenhoff
fc9e9892d8
Merge pull request #2006 from RaiKoHoff/RC2
Versioning files for PR #2005
2020-02-20 10:44:59 +01:00
RaiKoHoff
b5fedddce6 + upd: versioning files for PR #2005 2020-02-20 10:44:02 +01:00
RaiKoHoff
f18ee9ba63 Merge remote-tracking branch 'upstream/master' into RC2 2020-02-20 10:42:07 +01:00
Rainer Kottenhoff
01a054eb24
Merge pull request #2005 from maboroshin/patch-3
ScintillaWin: Canceling behavior of Japanese IME
2020-02-20 10:40:57 +01:00
maboroshin
dc0172bcb6
ScintillaWin: IMEJPCancelAction 2020-02-20 01:17:58 +09:00
RaiKoHoff
7ce226b8cd + chg: AddFileToRecentDocs 2020-02-19 16:30:09 +01:00
RaiKoHoff
0e3fc607cf Merge remote-tracking branch 'upstream/master' into NewFeatures 2020-02-19 11:51:22 +01:00
Rainer Kottenhoff
1ac8b8dc0d
Merge pull request #2004 from RaiKoHoff/RC2
version files only
2020-02-19 11:44:16 +01:00
RaiKoHoff
5fb5865818 + upd: version files (RC1 recompiled with fixed resource compiler dll (upcoming Win10 SDK v10.0.19505) 2020-02-19 11:32:29 +01:00
RaiKoHoff
189f70c1fc Merge branch 'RC1' into RC2 2020-02-18 16:01:14 +01:00
RaiKoHoff
a68257559d Merge branch 'RC1' into NewFeatures 2020-02-18 15:45:56 +01:00
RaiKoHoff
1b0622931f Merge remote-tracking branch 'upstream/master' into RC1 2020-02-18 15:45:29 +01:00
RaiKoHoff
7b72c23d0a Merge branch 'RC1' into NewFeatures 2020-02-18 15:25:41 +01:00
RaiKoHoff
bd49326856 + fix: handling of default settings for deprecated 'SciDirectWriteTech=...' 2020-02-18 14:43:13 +01:00
Derick Payne
e73e903e65 Updated Afrikaans Translation 2020-02-18 13:54:58 +02:00
Derick Payne
d7d00d161c Moved Doc folder 2020-02-18 13:35:30 +02:00
RaiKoHoff
65bafa15a7 Merge branch 'RC1' into NewFeatures 2020-02-18 10:35:43 +01:00
RaiKoHoff
ba166f8cfd Merge remote-tracking branch 'upstream/master' into RC1 2020-02-18 10:34:57 +01:00
Rainer Kottenhoff
a45dceb01f
Merge pull request #2001 from RaiKoHoff/RC1
Synchonize concurrent access to .ini-file (file locking api)
2020-02-18 10:30:45 +01:00
RaiKoHoff
8040d09c41 + upd: versioning files 2020-02-18 10:19:27 +01:00
RaiKoHoff
3b5b7af266 Merge branch 'Xperimental' into RC1 2020-02-18 10:17:21 +01:00
RaiKoHoff
8c96566039 + fix: concurrent access to .ini-File (lock file) 2020-02-18 10:16:58 +01:00
Rainer Kottenhoff
b9490e3204 Merge branch 'RC1' into Xperimental 2020-02-17 23:34:53 +01:00
Rainer Kottenhoff
b1d65d7a4e + upd: Current (2020-02-17) oniguruma DEV 2020-02-17 23:33:38 +01:00
RaiKoHoff
77937311e2 Merge remote-tracking branch 'upstream/master' into Xperimental 2020-02-17 18:35:37 +01:00
Rainer Kottenhoff
0864b943b1
Merge pull request #2000 from RaiKoHoff/RC1
Fix RegEx - group replacement backref
2020-02-17 18:32:53 +01:00
RaiKoHoff
27f56daf39 + chg: correct version numbering 2020-02-17 18:28:01 +01:00
RaiKoHoff
edfa781957 Merge branch 'RC1' into NewFeatures 2020-02-17 18:24:24 +01:00
RaiKoHoff
23381c958e Merge branch 'RC1' into Xperimental
# Conflicts:
#	src/VersionEx.h
2020-02-17 18:23:59 +01:00
RaiKoHoff
8a9087626b + fix: RegEx - group replacement backref 2020-02-17 18:18:29 +01:00
RaiKoHoff
8ddba0b652 Merge branch 'master' into Xperimental 2020-02-17 10:51:01 +01:00
RaiKoHoff
8ac79de304 Merge branch 'RC1' 2020-02-17 10:44:20 +01:00
RaiKoHoff
adff0bc598 Merge branch 'RC1' of https://github.com/RaiKoHoff/Notepad3 into RC1 2020-02-17 10:17:11 +01:00
Rainer Kottenhoff
e8db035a26 + chg: INI file read/write using synchronous file locking (shared read / exclusive write) 2020-02-17 08:43:25 +01:00
Rainer Kottenhoff
44c946cccd Merge branch 'RC1' into DevNewFeatures 2020-02-16 17:38:51 +01:00
Rainer Kottenhoff
48ccd68bc8
Merge pull request #1998 from RaiKoHoff/RC1
Fis issue on settings file handling
2020-02-16 17:35:10 +01:00
Rainer Kottenhoff
62cee2276b + fix: issue on settings file handling 2020-02-16 17:27:06 +01:00
Rainer Kottenhoff
c599c68415 Merge branch 'RC1' into DevNewFeatures 2020-02-16 13:03:25 +01:00
Rainer Kottenhoff
3183c8e000
Merge pull request #1997 from RaiKoHoff/RC1
Fix caret virtual space movement options: remove "SCVS_NOWRAPLINESTART"
2020-02-16 12:54:13 +01:00
Rainer Kottenhoff
31a64b809e + fix: caret virtual space movement options: remove "SCVS_NOWRAPLINESTART" 2020-02-16 12:43:31 +01:00
Rainer Kottenhoff
30ea5afab7 Merge branch 'RC1' into DevNewFeatures 2020-02-15 14:21:05 +01:00