Skip to content

Sync with Npp master#13

Merged
SinghRajenM merged 31 commits intoSinghRajenM:masterfrom
notepad-plus-plus:master
Nov 11, 2016
Merged

Sync with Npp master#13
SinghRajenM merged 31 commits intoSinghRajenM:masterfrom
notepad-plus-plus:master

Conversation

@SinghRajenM
Copy link
Copy Markdown
Owner

No description provided.

schnurlos and others added 30 commits October 15, 2016 14:29
including last updates following english.xml from 14.10.2016

Closes #2423
No more config.model.xml. config.xml is generated by notepad++ directly.
This bug can be reproduce by turning off smart highlight then restart
Notepad++ : some smart highlight options are still enabled.

Fixes #2442, closes #2465
Failed backups result in a user error message and asks to save the file anyways. Closes #2346, Closes #2441
Add new option to enable smat highlighting extension to anothe view,
while both views are visible side by side.
Tab settings per language broken due to the entries are doubled by error
during the preferences dialog reorganization.
Remove also unecessary files
- changes necessary to get back a buildable version with mingw, last adapted with #1229
- fixed some gcc compiler errors and warnings, see https://ci.appveyor.com/project/chcg/notepad-plus-plus/build/1.0.3 to https://ci.appveyor.com/project/chcg/notepad-plus-plus/build/1.0.13
- remaining task is the wincontrol "ReadDirectoryChanges", which uses ATL, propably not available with mingw
Closes #2478
* update translations to v7.1
* correct indent
Closes #2436
Update to v7.0

Closes #2412
Sync UTF-8 checkbox with UTF-8 radio button

Closes #2377
- added usable cmake config file by transferring files structure from visual studio project file
- contains also basic support for mingw make file creation
- see https://ci.appveyor.com/project/chcg/notepad-plus-plus/build/1.0.38 for successful with own appveyor config

Closes #2477
1. Radio button and edit box were overlapped
2. Edit box and comboxed were not vertically aligned.

Closes #2549
@SinghRajenM SinghRajenM merged commit 3b0e34f into SinghRajenM:master Nov 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants