Integrate N++ 5.7
-
Jocelyn Legault(from [585bb45be68a3f92cc0e04a41fd5912617862802]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ 5.8 release.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/585bb45be68a3f92cc0e04a... -
Jocelyn Legault
(from [648bff735b57acf9bd63bd28e5069f6f7682043b]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] (Author : Vitaliy Dovgan) Fix macro record bug from ANSI document.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/NppBigSwitch.cpp PowerEditor/src/ScintillaComponent/FunctionCallTip.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/648bff735b57acf9bd63bd2... -
Jocelyn Legault
(from [529f98be9e270a5e6e98dca13c6786f3e4fdfb73]) Fix heap corruption with color picker/popup.
ColorPicker owns a colorPopup and maintains its life cycle.
However, when colorPopup sent either a WM_PICKUP_COLOR or a WM_PICKUP_CANCEL
to its parent (the colorPicker), the parent deleted the colorPopup. Therefore
the returning call ended up in a destroyed object.
The fix is rather simple. Instead of constantly creating and deleting the
colorPopup, we simply create it the first time it's used, and hide and show it
afterwards. The colorPopup is finally destroyed when the colorPicker is destroyed.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/529f98be9e270a5e6e98dca... -
Jocelyn Legault
(from [f91160d1d6b27c0b61f758b937ecd5f4cb2ecaac]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[NEW_FEATURE] Add Word count feature in Summary command.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/NppCommands.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f91160d1d6b27c0b61f758b... -
Jocelyn Legault
(from [e0701ecb3edb52076d58379c5e008974614b8df4]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] (Author: Francois-R Boyer) Fix saving UCS-2 text file corrupted bug.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/e0701ecb3edb52076d58379... -
Jocelyn Legault
(from [8ed5a5cebbee4ad12a456ecfa592252cc00b45ef]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ 5.8.1 release
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/8ed5a5cebbee4ad12a456ec... -
Jocelyn Legault
(from [3a0d6f1e557faa7400a553217781399c288f78e5]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] Apply a walk around solution for Actionscript crash problem.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/3a0d6f1e557faa7400a5532... -
Jocelyn Legault
(from [2b108476f6f97644ca8859d65ff696a17e5d17d9]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] Fix windows 7 crash bug while executing update.
Conflicts:
PowerEditor/src/MISC/Process/Process.cpp PowerEditor/src/MISC/Process/Process.h PowerEditor/src/WinControls/Preference/preference.rcSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/2b108476f6f97644ca8859d... -
Jocelyn Legault
(from [e5ee72d6e60c135d01907a983a23c45170d944bd]) Add missing header file in vcprojs.
The header Utf8.h, added to the sources earlier was never added to the
project files.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/e5ee72d6e60c135d01907a9... -
Jocelyn Legault
(from [6d3370689f179472cc93e595feba0d9279f84bd6]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[RELEASE] Notepad++ 5.8.2 release.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6d3370689f179472cc93e59... -
Jocelyn Legault
(from [56f2f0efff4c555ca891ce9bba7869e58b9d050e]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] (Author: Mohamed Amr) Fix C# syntax highlighting disabled problem after reloading.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/56f2f0efff4c555ca891ce9... -
Jocelyn Legault
(from [9e6ca6659bf3d5a5a2962b69ba75e78321e05130]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BEHAVIOUR_CHANGED] Modify SaveFile dialog behaviour: it will not process a given directory as saving file name. It browse inside the directory instead.
[BUG_FIXED] Fix build problem for ANSI version.
[UPDATE] Update GUP.exe to v1.9.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/9e6ca6659bf3d5a5a2962b6... -
Jocelyn Legault
(from [05067e4c0a11e00fe1ba125deb127e46eecdb2e2]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-5.7
[BUG_FIXED] Fix macro recording bug for the non-ASCII characters.
Conflicts:
PowerEditor/src/NppNotification.cpp PowerEditor/src/WinControls/shortcut/shortcut.cpp PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/05067e4c0a11e00fe1ba125... -
Jocelyn Legault
(from [7fe047ea9d4656790831965bcea0645083dd8733]) Fix font size bug related to session loading.
The bug:
When loading a session where the sub view contained files but not the main
one, and the active session was the main one. The impact of such a session
file was weird, as the font size used for the sub view was 0 or 1, making the
text illegible.The repro steps:
http://joce.pastebin.com/fvd7P1kDThe screenshots:
These are screenshots of the same session, one where the files are in the main
view (loads correctly) and one where the files are in the sub view (when the
bug is visible):
When it loads correctly: http://is.gd/g40R5
When the sessions are inverted and the bug shows: http://is.gd/g40WCThe fix:
- factorizes the session loading code in a function. - loads the main view first - loads the sub view second, but loads it as the main view if the main view is still empty. - loads the index of the current active view only if the sub view isn't empty and sets it to 0 (the index of the main view).All this as for effect that no files will be loaded in the sub view if the
main view is empty.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7fe047ea9d4656790831965... -
Jocelyn Legault
(from [5475bb70019a7cd3e0d4351b0d3c9129ef6ea198]) Remove useless variable in Notepad_plus_Window.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/5475bb70019a7cd3e0d4351... -
Jocelyn Legault
(from [d13c17f382507451ae44dc3a86dff58fac0e2aa8]) Fix memory corruption upon exit.
Upon exit, if you had highlighted links, the wrong destructor was called to
free the StyleMaps (delete []instead ofdelete), causing memory
corruption.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d13c17f382507451ae44dc3... -
Jocelyn Legault
(from [05ce058a94d0a8cfc836120071557663065910b0]) Fix memory corruption.
An un-deletable pointer could be deleted under some circumstances. This fix
uses a better heuristic to determine if the pointer is deletable or not.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/05ce058a94d0a8cfc836120... -
Jocelyn Legault
(from [796379f981e14c84ee995b8b2f1da69b484d11c1]) Really fix the font size issue.
After much investigation, it was found that the bug appeared mainly in debug.
After a few debug session, the issue was traced to an uninitialized zoom
variable that defaulted to 0xcdcdcdcd, or -842150451.
The zoom variable is now properly fixed and the bug can no longer be
reproduced.The previous "fix" finally wasn't one at all. It just hid the behavior since
the sub view wasn't shown. I do believe however that it's still a good
refactor and a better behavior and should be kept.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/796379f981e14c84ee995b8... -
Jocelyn Legault
(from [4d542fa160bc7f790f5b72fff65fe840294ac533]) Encode localizationString.h in UTF-8
This file was UTF-16, but Lint can't deal with such files. It's now been
re-saved in UTF-8.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/4d542fa160bc7f790f5b72f... -
Jocelyn Legault
(from [4449563897b2358fb73be58ca620600ca969c947]) Fix Lint error 864
"error 864: Info -- Expression involving variable '' possibly depends on order of evaluation."
Reassured Lint by making Buffer::getFileTime() const and indicated it was ok
for the string modified by std::transform() in localization.cpp.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/4449563897b2358fb73be58... -
Jocelyn Legault
(from [560f77a062d9e6e7307347b8ad14a7af1d9f10e8]) Fix Lint error 750
"error 750: Info -- local macro '' not referenced"
Removed macros DIR_LEFT and DIR_RIGHT from Notepad_plus.cpp that were no
longer used.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/560f77a062d9e6e7307347b... -
Jocelyn Legault
(from [6376a9ac6288ea9f6c12ba684133c2971248a23a]) Fix Lint error 1778
"error 1778: Info -- Assignment of string literal to variable '' is not const safe"
Modified the constness of opVerb to match its use.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6376a9ac6288ea9f6c12ba6... -
Jocelyn Legault
(from [8cfa1417c166cbc23a627b4040c28ce5c8ff6e83]) Fix Lint error 838
"error 838: Info -- Previously assigned value to variable '' has not been used"
Variables are now declared when needed and not assigned unless needed to.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/8cfa1417c166cbc23a627b4... -
Jocelyn Legault
(from [52b23fe0ffd47ea1a2c2860b4701f7e7a2818eb5]) Fix Lint error 1705
"error 1705: Info -- static class members may be accessed by the scoping operator"
All static class members are now accessed through the scoping operator.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/52b23fe0ffd47ea1a2c2860... -
Jocelyn Legault
(from [d3ede0f0f19010da5521bd486c86490c08cf94ad]) Fix Lint error 1401
"error 1401: Warning -- member '' not initialized by constructor"
Added all the missing member not initialized in the initialization lists and
added a default constructor to NppData so its values would be initialized when
one is created in PluginsManager.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d3ede0f0f19010da5521bd4... -
Jocelyn Legault
(from [d4e1fff97b053a47b6406958d76c41c4c6ab81dc]) Fix Lint error 773
error 773: Info -- Expression-like macro '' not parenthesized
Parenthesized the culprit expression.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d4e1fff97b053a47b640695... -
Jocelyn Legault
(from [c070d4316d4b56a126388308f55d0af8f6f8941c]) Fix Lint error 539
"error 539: Warning -- Did not expect positive indentation from line "
A previous whitespace cleanup wrongly indented the culprit line. I've
surrounded the code affected by the if statement to make the intended behavior
clearer.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/c070d4316d4b56a12638830... -
Jocelyn Legault
(from [f49b35592a77d8726b77546679e4e6a33b834096]) Fix Lint error 850 (again).
"error 850: Info -- for loop index variable '' whose type category is '' is modified in body of the for loop that began at 'line '"
The error popped up again after a bunch of other lint fixes were put in.
Putting the linting-out comment outside the function did the trick this time
around.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f49b35592a77d8726b77546... -
Jocelyn Legault
(from [7df3747145cfbe202d00d05fcc5503ea3c7eb8ca]) Fix Lint error 840
"error 840: Info -- Use of nul character in a string literal"
In all the cases, the string referred to was the version string which is
expected to terminate with the explicit nul char. All issues were linted out.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7df3747145cfbe202d00d05... -
Jocelyn Legault
(from [7f4ca4ee993e4799d9972a9b0b8581616064b461]) Remove duplicate member in derived class.
The id member of PluginCmdShortcut was a redefinition from CommandShortcut.
Just making the id member in CommandShortcut protected allowed for the
removal of the duplicate one and its corresponding getter.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7f4ca4ee993e4799d9972a9... -
Jocelyn Legault
(from [6d650ac1935c968bd5f8a1ec6bc3748ca7da1f23]) Fix Lint error 850
"error 850: Info -- for loop index variable '' whose type category is '' is modified in body of the for loop that began at 'line '"
The loop in FileManager::checkFilesystemChanges() does strange things and I'm
not changing that. Lint error has been linted out.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6d650ac1935c968bd5f8a1e... -
Jocelyn Legault
(from [2096e8c922dcccc342a83c61e2872a6228573645]) Fix Lint error 438
"error 438: Warning -- Last value assigned to variable '' not used.
Lint is confused about var args, so the var args code in npp_debug.cpp -
FuncGuard::printf() has been linted out.
The cmdID in ShortcutMapper::run_dlgProc wasn't used and therefore was
removed.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/2096e8c922dcccc342a83c6... -
Jocelyn Legault
(from [1bb898dc7f1aa078b3c99dd7511a564e763af0ed]) Fix Lint error 767
"error 767: Info -- macro '' was defined differently in another module"
ADD and REMOVE were both defined in trayIconControler.h and
UserDefineDialog.cpp. Changing the defines in trayIconControler.h (and
dependencies) also allowed me to fix a compilation error I got in
UserDefineDialog.cpp during the integration. That allowed me to put back the
static variables ADD and REMOVE to SymbolsStyleDialog.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/1bb898dc7f1aa078b3c99dd... -
Jocelyn Legault
(from [29408384fee9c9cb38d70926b04314a89527b4af]) Modify when memory tracking is enabled.
Memory tracking is now enabled when in not compiling in SHIPPING (instead of
only in DEBUG previously).Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/29408384fee9c9cb38d7092... -
Jocelyn Legault
- State changed from new to needs_ack
- Assigned user changed from Jocelyn Legault to Thell Fowler
-
Jocelyn Legault
(from [297eaf4a5c39efb8fc86924fc3f5ea1f0e4a82c0]) Add tests to guard against memory corruption.
New tests for WcharMbcsConvertor::StringBuffer were created to insure the
memory corruption found in there earlier doesn't come back.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/297eaf4a5c39efb8fc86924... -
-
Thell Fowler
(from [952096ffae1e5c7c5cd242eafc77fbec6dd9fb3b]) Clean code from header to source file.
- The ButtonDlg class was partly implemented in the header file. This has been corrected.
- Definition of constants in the header were replaced by defines.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/952096ffae1e... -
Thell Fowler
(from [e828287b1fe5827bebc611c34a2c122918b56555]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[RELEASE] Notepad++ v5.6.3 release
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.rc PowerEditor/src/WinControls/Preference/preference.rc PowerEditor/src/resource.h PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/e828287b1fe5... -
Thell Fowler
(from [db8c12edefadbd613bc310c29c7a38e849f3635a]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
- npp_official_svn: [NEW_FEATURE] Add restore button in fullscreen and postIt mode.
Conflicts:
PowerEditor/src/Notepad_plus.h PowerEditor/src/ValueDlg.cpp PowerEditor/src/ValueDlg.h PowerEditor/src/resource.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/db8c12edefad... -
Thell Fowler
(from [c11086ad092bb013fd4b6422856a97de5ccbda1e]) Adjust the About Box
- About box has misaligned elements and was using an icon that N++CR doesn't use. This has been fixed.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/c11086ad092b... -
Thell Fowler
(from [dbc9129af38366d97f191c6a363e7cd5bf648723]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
Conflicts:
PowerEditor/src/resource.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/dbc9129af383... -
Thell Fowler
(from [eadef13ea79c8a923b93f8406a4e02081dc750a2]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix xml/html encoding overrides BOM if present.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/eadef13ea79c... -
Thell Fowler
(from [5728b69ef68f597de3cec59d4d74df700f58790f]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
Conflicts:
PowerEditor/src/Notepad_plus.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/5728b69ef68f... -
Thell Fowler
(from [2e2bf307727c72d5404ca6fbf5c83d696016af5a]) Add missing resource to the vcprojs.
- chameleon.ico is used in rc files (though not actually used by N++CR) and the file was not present in the resource section of the projects.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/2e2bf307727c... -
Thell Fowler
(from [d3a63e491a743c4d68afe333828575e4655b50b3]) Moved back FindReplaceDlg.h to its rightful place.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/d3a63e491a74... -
Thell Fowler
(from [240a7817773490615c50e4f3f180e8e9cd6efe60]) Fix compilation error from the previous merge.
The code did not compile previously with the whole Scintilla / Scitilla issue.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/240a78177734... -
Thell Fowler
(from [a224789a8d723b6f77181731974039a876a5f540]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW] (Author : Darko Martinovic) Add "set find text and find next" feature.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/a224789a8d72... -
Thell Fowler
(from [750b7ba9e6bf4c8e25835ba08be2548505ecf686]) Move the feil again (see previously mentioned bug).
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/750b7ba9e6bf... -
Thell Fowler
(from [ce51057da197cb624e5903928f229608898f9dac]) Fix compilation error.
The compilation error could not have been detected earlier due to the
directory rename bug in git.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/ce51057da197... -
Thell Fowler
(from [2b714ddbf81e163b7641eb0dcb92ed94ff64bb2a]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fixed Chinese characters display problem after "find in the current document".
Conflicts:
PowerEditor/src/Notepad_plus.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/2b714ddbf81e... -
Thell Fowler
(from [57f7aecc589393b07d1529e5492e58595a81118b]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
BUG_FIXED] (Author : Beetny) Fix "Close Window(s)" in Window dialog bug (if
file is dirty and cancel to close).Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/57f7aecc5893... -
Thell Fowler
(from [9b11ed5d2a2b9182336c1663033e30ee08272ff6]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix loading encoding file making file corrupted (after saving).
Conflicts:
PowerEditor/src/ScintillaComponent/Buffer.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/9b11ed5d2a2b... -
Thell Fowler
(from [b128dcc8403596d0dcfff115902e07f5ffe069c1]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
Conflicts:
PowerEditor/src/ScitillaComponent/ScintillaEditView.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/b128dcc84035... -
Thell Fowler
(from [d886ab8fee859656dc6b286431cfc4a40ba2407b]) Move file in order to merge (see previously mentioned bug).
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/d886ab8fee85... -
Thell Fowler
(from [29da61223d1ccb442ebe5668135a6ac51fafe5b7]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[RELEASE] Notepad++ v5.6.6 release.
Conflicts:
PowerEditor/src/resource.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/29da61223d1c... -
Thell Fowler
(from [378f916543e323472ecf75c8ec288e17c64f696e]) ScincitllaComponent -> ScitillaComponent
git issue workaround
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/378f916543e3... -
Thell Fowler
(from [1122da700d237e2e1df1aa3fc9db4822b8cac771]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW] (Author : Christian Cuvier) Add "\u" in find extened mode to find Unicode encoding character(ex. "\u00e9" find 'Ǹ').
Conflicts:
PowerEditor/src/ScintillaComponent/AutoCompletion.cpp PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp PowerEditor/src/resource.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/1122da700d23... -
Thell Fowler
(from [b336ada4ed8e6ee05bf633720e75ac482ddfc428]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] Refactor Notepad_plus.cpp (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/NppCommands.cpp PowerEditor/src/WinControls/TaskList/TaskListDlg.h PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/b336ada4ed8e... -
Thell Fowler
(from [2208c2797ed4f9e957bf26430dceaf2802c440a6]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[OPTIMIZE] (Author : Sune Marcher) Rewrite of menuID2LangType function.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Parameters.h PowerEditor/src/ScintillaComponent/AutoCompletion.cpp PowerEditor/src/ScitillaComponent/ScintillaEditView.h PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/2208c2797ed4... -
Thell Fowler
(from [346b0a7b71f3bad46c48902ade5d75f042f26f0c]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[ADD] Add GUP.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/346b0a7b71f3... -
Thell Fowler
(from [4506ce11e903759e9b0168d26e25ae295a73dd46]) ScitillaComponent -> ScintillaComponent
git issue workaround
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/4506ce11e903... -
Thell Fowler
(from [aebce6bcd4b89b2c2e85c8be38a76b95600d6b6b]) Move Notepad_plus::command to its own file.
In preparation for the next commit to integrate, the Notepad_plus::command
method was moved to its own file. This will facilitate the coming merge.
I also had to make modifications to Notepad_plus.h to remove a the static
qualifier to a function declared in there (doesn't make any sense) that is
used in both Notepad_plus.cpp and NppCommands.cpp.
The modifications in UserDefineDialog.* are somewhat unrelated, but following
the migration of the method, I got a weird compilation error related to static
consts defined in a class. This fix is temporary, I hope.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/aebce6bcd4b8... -
Thell Fowler
(from [dd6d3267649afa2873b0ba16a3b4bcdcab743392]) ScintillaComponent -> ScitillaComponent
git issue workaround
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/dd6d3267649a... -
Thell Fowler
(from [dafa9554e160ac544de2329b30dd03c00d013f9c]) Fix compilation errors.
The compilation error could not have been detected earlier due to the
directory rename bug in git.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/dafa9554e160... -
Thell Fowler
(from [29455912937880e83e21d7252ce8d73c2a48e738]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] Refactor Notepad_plus.cpp (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/NppIO.cpp PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/294559129378... -
Thell Fowler
(from [01d47dcb1ff29ba78713d921bd4c2af18f693c9c]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[RELEASE] Notepad++ v5.6.5 release.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/01d47dcb1ff2... -
Thell Fowler
(from [3d113f1fd902d8ebe7d6a45c2262c8a391bfc876]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[REVERT] menuID2LangType function is reverted due to its performance issue.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Parameters.h PowerEditor/src/winmain.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/3d113f1fd902... -
Thell Fowler
(from [a847c85fd0dc2905d90d97e0c340b08fb8199f9a]) ScitillaComponent -> ScintillaComponent
git issue workaround
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/almostautomated/npp-community/commit/a847c85fd0dc... -
npp-community
(from [213ee7e0574fc7e593274c4370e668322c50a2b1]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] Refactor Notepad_plus.cpp (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/NppBigSwitch.cpp PowerEditor/src/NppNotification.cpp PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/213ee7e0574fc7... -
npp-community
(from [197080748065139145b28043de96a9bc1131a718]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix the bug while giving command C:\NppDir>notepad++ (w/o quote), npp try to open file "notepad++".
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/19708074806513... -
npp-community
(from [8c2b3385eb1cadb868942af26bdb8ea07a20c006]) Move the runProc and notify methods to their own files.
In preparation for the next commit to integrate, the file runProc and notify
methods were moved to their own files. This will facilitate the coming merge.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/8c2b3385eb1cad... -
npp-community
(from [e71013e2bc10be58cdd2adf049b98b201124f997]) Prepare for the coming merge.
The coming merge will displace tons of methods from Notepad_plus.cpp to
NppLocalization.cpp. Since we already have modifications in these methods, we
preemptively moved them.Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/e71013e2bc10be... -
npp-community
(from [3ccee75570ff202333f661b25aef486d6dc3a986]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix the bug while giving command C:\NppDir>notepad++ (w/o quote), npp try to open file "notepad++".
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/NppIO.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/3ccee75570ff20... -
npp-community
(from [9e009da33995a0eae23013a4c13c03bd45dfaadd]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[CLEAN_UP] (Author : Jocelyn Legault) Initialize correctly the DockingDlgInterface. Clean up the docking manager's code.
Conflicts:
PowerEditor/src/NppBigSwitch.cpp PowerEditor/src/WinControls/DockingWnd/DockingDlgInterface.h PowerEditor/src/WinControls/DockingWnd/DockingManager.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/9e009da33995a0... -
npp-community
(from [1fe13f54f39bd000fd3653371689f6affe230204]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] refactor Notepad_plus.cpp.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/NppLocalization.cpp PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/1fe13f54f39bd0... -
npp-community
(from [a4e07b9ad4def9bdd3e0fa248737816149870a5c]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix the bug while changing the language list in Style Configurator, the "Save and close" button is enabled.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/a4e07b9ad4def9... -
npp-community
(from [92e169243c2df7abda0bbae517509cdfa6994818]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[RELEASE] Notepad++ v5.6.7 release.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/NppNotification.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/92e169243c2df7... -
npp-community
(from [965d19f39e3e429e55d27e238716d7bc643bce98]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix "finds in all opened files" crash bug.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/965d19f39e3e42... -
npp-community
(from [6cc2e4006ac81c5e1430db940ac7c9c798c85b47]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] Update native language model and chinese.xml.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/6cc2e4006ac81c... -
npp-community
(from [c69ffb5ba51f030e92b55d88c2b6c5534ee62587]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] (Author : Christian Cuvier) Update NppHelp.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/c69ffb5ba51f03... -
npp-community
(from [5582e8adef09ecf1cfa5d7791be6acecb1f6a1db]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[RELEASE] Notepad++ v5.6.8 release.
Conflicts:
PowerEditor/src/ScintillaComponent/FunctionCallTip.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/5582e8adef09ec... -
npp-community
(from [65265a18963b611dfcc2332d34278266358009c0]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] refactoring (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/WinControls/ToolBar/ToolBar.cpp PowerEditor/src/WinControls/ToolBar/ToolBar.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/65265a18963b61... -
npp-community
(from [05bd0cea42b08ed5df4120d766fd7a2defdbbbc5]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] minor modification.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/NppCommands.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/05bd0cea42b08e... -
npp-community
(from [0421540049ef3d690f2097519c6025b9e65a2786]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[FIX] Fix some typos.
Conflicts:
PowerEditor/src/Notepad_plus.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/0421540049ef3d... -
npp-community
(from [fee56ce576d29b2b591e0afbe1ca645aa713d34a]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix comment stream without selection bug.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/fee56ce576d29b... -
npp-community
(from [6a8e6c5a128c43c7b5d725f2a9e8ba56a8c79554]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix language switching to English not working bug.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/localization.cpp PowerEditor/src/localization.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/6a8e6c5a128c43... -
npp-community
(from [9c6a315fd40b768fb71d30af83cc9e7e4749a8fa]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
Add Bitmap.cpp file, currently unused.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/9c6a315fd40b76... -
npp-community
(from [aeeb2d490e32a1b2059d8631f0ba3c08015d08f1]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[FIX] Fix the compiling problem for ANSI build.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/aeeb2d490e32a1... -
npp-community
(from [3d12e0f0684d8b0c5add2eb5ce6c59441ec5b9e8]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW_BEHAVIOUR] File detection : Switch to modified or deleted file while user is asked to reload or keep the file.
Conflicts:
PowerEditor/src/Notepad_plus.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/3d12e0f0684d8b... -
npp-community
(from [a830f5122d7a3ac3233abdc5b3d6df86c8674e49]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix closing several detected non-existing files bug.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/a830f5122d7a3a... -
npp-community
(from [58ce67fdc5d41ac04e5623455184830916ccfc47]) Simplify and clean Notepad_plus_Window's interface.
- Removed useless notepad_plus.h dependency in
Notepad_plus_Window.h
- Moved a few methods' implementation to the source file.
- Made the Notepad_plus member a pointer.
- Added constructor and destructor to handle creation / destruction of the said object.
- Removed redundant Notepad_plus_Window::Destroy method.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/58ce67fdc5d41a... - Removed useless notepad_plus.h dependency in
Notepad_plus_Window.h
-
npp-community
(from [74241add7f649a98ec0d471b5fd002868e74bc5f]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] refactoring (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/NppBigSwitch.cpp PowerEditor/src/NppCommands.cpp PowerEditor/src/NppNotification.cpp PowerEditor/src/localization.cpp PowerEditor/visual.net/notepadPlus.vcprojSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/74241add7f649a... -
npp-community
(from [f76d3667933ac8e7fe79d37939c8ba150f0dd6ba]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[BUG_FIXED] Fix premature deallocation bug for import UDL.
Conflicts:
PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h PowerEditor/src/localizationString.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/f76d3667933ac8... -
npp-community
(from [a16f749169fa2f6f531f114b3396df3f3c5d7395]) Update the VC8 project to include the new files.
- Notepad_plus_Window.* files were forgotten in a previous merge / commit.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/a16f749169fa2f... -
npp-community
(from [ac47a3aee367cbf7666538a13be6c095125e60c1]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[UPDATE] (Author: Sin Thesis) Refactoring (in progress).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/NppBigSwitch.cpp PowerEditor/src/NppCommands.cpp PowerEditor/src/NppIO.cpp PowerEditor/src/NppNotification.cpp PowerEditor/src/WinControls/shortcut/shortcut.cpp PowerEditor/src/winmain.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/ac47a3aee367cb... -
npp-community
(from [b01d5b1e605cbfa29b799326dde90324be5322cb]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW_FEATURE] Add import/export User Defined Language features.
Conflicts:
PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h PowerEditor/src/ScintillaComponent/UserDefineDialog.cppSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/b01d5b1e605cbf... -
npp-community
(from [93091b208b88d705f4aae32f0b0d9d46bda03b16]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW_FEATURE] Add "Inverse bookmark" feature.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/93091b208b88d7... -
npp-community
(from [15ac679d7224e799d8177e336c48a90c77bb88b6]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[RELEASE] Notepad++ 5.7 release.
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/15ac679d7224e7... -
npp-community
(from [803bde15aef38b7c1f10e72838b0f5a4471526ed]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn
[NEW] Add NPPM_SAVECURRENTFILEAS message.
Conflicts:
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.hSigned-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/803bde15aef38b...
Please Sign in or create a free account to add a new ticket.
With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.