[Update] Integrate N++ 5.6.1 to N++CR
Reported by Jocelyn Legault | December 7th, 2009 @ 06:57 PM | in v2.0.0
We need to integrate the most recent version of N++ into the
community release.
It is possible that not all the features of 5.6.1 will make it in.
The non-trivial features will be posted here and discussed before
integration.
Comments and changes to this ticket
-
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [2abd042761b5b57615e82dfacdda323c7fabedd2]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Set extension automatically (according to set document language) in save as dialog.
Conflicts:
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/2abd042761b5b57615e82df... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [1ae04fd29ffcd70f64391cea2c6f2601b09c0bdc]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: Replaced nppcm with NppShell.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/1ae04fd29ffcd70f64391ce... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [69bd1556237844577dbe46d3013be1882310d93c]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Try to catch plugin crash.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.rc PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h PowerEditor/src/ScitillaComponent/Buffer.cpp PowerEditor/src/ScitillaComponent/FindReplaceDlg.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/69bd1556237844577dbe46d... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [7a7e9ef7e562373506f39df4d6d2aade7d9db3ee]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7a7e9ef7e562373506f39df... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [9c405d932f373988be8c2c5e84e94b70d49001b9]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/9c405d932f373988be8c2c5... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [6752c91e05bfc4604294f9aa22c2d81722a0798a]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.rc[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6752c91e05bfc4604294f9a... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [108cd90c566ed04ded5e9ae7c7a42a7cbca19f5c]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [RELEASE] v5.5.1 release.
Conflicts:
PowerEditor/src/ScitillaComponent/FindReplaceDlg.h PowerEditor/src/resource.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/108cd90c566ed04ded5e9ae... -
Jocelyn Legault December 15th, 2009 @ 12:16 AM
(from [d08967abe0bee2d968d56d055a6ddd261cc28ec0]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: NppShell:
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d08967abe0bee2d968d56d0... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [ddc5fff491206ba87feb85489e2ecb8fa3aac5c8]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix column editor insert number bug in virtual space mode.
Conflicts:
PowerEditor/src/Notepad_plus.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/ddc5fff491206ba87feb854... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [7be3f4bd8b6675e9d6c1ab1e3861d845db2d9db7]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add COBOL, D, Gui4Cli, PowerShell and R language support.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7be3f4bd8b6675e9d6c1ab1... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [4d49d66139770214a37a689e712e1d81f47e0e0f]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add SQL ESC symbol ''.
Conflicts:
PowerEditor/src/Notepad_plus.rc PowerEditor/src/ScitillaComponent/ScintillaEditView.h scintilla/src/LexUser.cxx[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/4d49d66139770214a37a689... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [515021b22d43690044751070c00ede0c0f53d327]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix Calltip hint bug and add a new capacity in it.
Conflicts:
PowerEditor/src/ScitillaComponent/AutoCompletion.cpp PowerEditor/src/ScitillaComponent/FunctionCallTip.cpp PowerEditor/src/ScitillaComponent/FunctionCallTip.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/515021b22d4369004475107... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [ccf12fcf2c0f9c60de17dcea243c09e00d993bdd]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_MINOR_FEATURE] Add the ability to add the second keyword group for user in both LISP and Scheme languages.
Conflicts:
PowerEditor/src/ScitillaComponent/ScintillaEditView.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/ccf12fcf2c0f9c60de17dce... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [e00bf83bf9e1c9a21488009d18f04c1723f9b14c]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] (Author : Slurdge) Add system tray context menu and new command argument "-systemtray".
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.rc PowerEditor/src/winmain.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/e00bf83bf9e1c9a21488009... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [1610beea2a7ecef5449152cdaa01319d4502742b]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix systemtray close crash bug.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/winmain.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/1610beea2a7ecef5449152c... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [f95e70a76db4ee183dbf32d314cbfe30db5a117b]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add Marker Jumper feature.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Notepad_plus.h PowerEditor/src/Notepad_plus.rc PowerEditor/src/menuCmdID.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f95e70a76db4ee183dbf32d... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [7499ac49b2f0bf5f027fc44b891726feb032b6b5]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add COBOL, D, Gui4Cli, PowerShell and R language support (in progress).
Conflicts:
PowerEditor/src/ScitillaComponent/ScintillaEditView.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7499ac49b2f0bf5f027fc44... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [6002d08a5d6497ca146f09a94dfec289375ccf2a]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Make Marker Jumper wrap able.
Conflicts:
PowerEditor/src/Notepad_plus.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6002d08a5d6497ca146f09a... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [1961e46e4b525473dabf181143b0dbf06ba9d668]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add Kyrgyz language file.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/1961e46e4b525473dabf181... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [46a21e61ea4d0cb866750c0a7fcc76cbbad81df6]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add Chinese BIG5 encoding (in progress).
Conflicts:
PowerEditor/src/ScitillaComponent/Buffer.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/46a21e61ea4d0cb866750c0... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [dc68fb9d06fcbc03e9e84bba346886214301d55b]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Provide a walk around solution for the wrap symbol display problem in scintilla.
Conflicts:
PowerEditor/src/ScitillaComponent/ScintillaEditView.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/dc68fb9d06fcbc03e9e84bb... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [95df67d38e3b9715d16542d279bfe7b1e525a1b6]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add Chinese simplified, Japanese, Korean, Thai... encodings.
Conflicts:
PowerEditor/src/MISC/Common/Common.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/95df67d38e3b9715d16542d... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [b06a083e87975f0e47562fdfc04bf01aa65df806]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add new encodings, make status bar work for the new encodings.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/localizationString.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/b06a083e87975f0e47562fd... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [3c340f26f94d84d7ac18732fd11764752337d0d5]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] File Encoding is remembered in the session.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/3c340f26f94d84d7ac18732... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [ca3d3c529583c0744f39e478b7debee4f98bfad9]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix encoding files loading bug.
Conflicts:
PowerEditor/src/ScitillaComponent/Buffer.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/ca3d3c529583c0744f39e47... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [49d8ce5b11d2366f27fc99976bf339bea808cea2]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add new encodings.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h PowerEditor/visual.net/notepadPlus.vcproj[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/49d8ce5b11d2366f27fc999... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [b4bff4474569050c62e88ce33fc5f95007e3772c]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [ADD] Add the forgotten symbols.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/b4bff4474569050c62e88ce... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [f55d83788afcacfaec962dbdb38511be76a12147]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add indent guide line highlighting for html/xml tags.
Conflicts:
PowerEditor/src/Notepad_plus.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f55d83788afcacfaec962db... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [aef730da4e504207e900bf0a8c8bfdc0b87cb04c]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [ADD] Add the style themes.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Parameters.cpp PowerEditor/src/WinControls/ColourPicker/WordStyleDlg.h PowerEditor/src/WinControls/StaticDialog/StaticDialog.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/aef730da4e504207e900bf0... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [01fa1942e9ce3ee307f9c5a8cfcdc6f766d9d217]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW_FEATURE] Add auto-detection of HTML/XML file encoding.
Conflicts:
PowerEditor/src/Notepad_plus.h PowerEditor/src/Parameters.cpp PowerEditor/src/ScitillaComponent/Buffer.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/01fa1942e9ce3ee307f9c5a... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [d1b03e560499bea7a7e4a60d12583887fe9cb649]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [RELEASE] Notepad++ v5.6 release.
Conflicts:
PowerEditor/src/MISC/Common/Common.cpp PowerEditor/src/MISC/Common/Common.h PowerEditor/src/Notepad_plus.cpp PowerEditor/src/Parameters.cpp PowerEditor/src/ScitillaComponent/Buffer.cpp PowerEditor/src/WinControls/WindowsDlg/WindowsDlg.cpp PowerEditor/visual.net/notepadPlus.vcproj[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/d1b03e560499bea7a7e4a60... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [742c4794888915968e7eab342b2f80e77f00589e]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
Conflicts:
PowerEditor/src/resource.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/742c4794888915968e7eab3... -
Jocelyn Legault December 17th, 2009 @ 02:27 AM
(from [a5c2b0bc88548fe9af60ff051f0aad13ba60bd9d]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix the Unicode to ANSI encoding bug.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/a5c2b0bc88548fe9af60ff0... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [8ba7f2e63ab662172595036853b4a6a6febbb10f]) Npp Official 5.6: Fix the lint warnings
- Lint warnings are now fixed and this branch fully integrates Npp Official in N++CR.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/8ba7f2e63ab662172595036... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [94763b421f7a01c707dc19822b83b1fba8253e4f]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix brace highlighting breaking issue.
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/resource.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/94763b421f7a01c707dc198... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [87a9acaf1b1445a7bb2addb5021d1db48f85b612]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [CLEAN] Move EOL format items to sub menu Edit.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/87a9acaf1b1445a7bb2addb... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [caf63b64adacef67c0dd5601d1bc7454f05024b5]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] Add find result commands in the menu.
Conflicts:
PowerEditor/src/Notepad_plus.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/caf63b64adacef67c0dd560... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [9e97e055d056654da204a904f5987680edb7a148]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix localization combo box unselected in preference dialog bug after startup (when a localization file is in use).
Conflicts:
PowerEditor/src/Parameters.cpp PowerEditor/src/Parameters.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/9e97e055d056654da204a90... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [c919a4a6f53a1ad7b46914c274c46d6a64b3e13e]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix the Context menu installation in installer.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/c919a4a6f53a1ad7b46914c... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [e791927832efdf4238eab69c30900a0dc0562f3c]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [UPDATE] Update the localization files.
Conflicts:
PowerEditor/src/localizationString.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/e791927832efdf4238eab69... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [ca78cb0075205e946cdc0c2c319f39d8dc4c58b5]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [NEW] unfold while jumping markers.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/ca78cb0075205e946cdc0c2... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [af497c37b29ba334a5ec8d7c18d53d25ff93031f]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [RELEASE] Notepad++ v5.6.1 release.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/af497c37b29ba334a5ec8d7... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [5ee5a70b16a321372f4b183e60559d692dd73d2c]) Npp Official 5.6.1: Fix compilation.
- Made the project compile following the integration to 5.6.1
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/5ee5a70b16a321372f4b183... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [f55f5e4bd4f853db84d97353adce4ea20d5af369]) Npp Official 5.6.1: Fix the lint warnings
- Lint warnings are now fixed and this branch fully integrates Npp Official in N++CR.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/f55f5e4bd4f853db84d9735... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [b4c879bf32b36b0c4332ecef34cbf4fd2cb3d5b7]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix the translated sub menu entries applying on the menu item.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/b4c879bf32b36b0c4332ece... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [46c0db6658a09621a146c0dc300d0621178fc679]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix tag highlighting bug while disabling indent guide lines.
Conflicts:
PowerEditor/src/Notepad_plus.cpp[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/46c0db6658a09621a146c0d... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [4e9a3432845164e9d6901797d6a62f84d97f2c87]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [UPDATE] Update 3 localization files : English, French and Chinese.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/4e9a3432845164e9d690179... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [fa4e5bbf3ac4bd514567a0a14e9c5ef84d3393b8]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] Fix the Unicode localization file display incident.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/fa4e5bbf3ac4bd514567a0a... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [c14ec64cc2d913c6eda00f59c10be412c63445e9]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [RELEASE] Notepad++ v5.6.2
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/resource.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/c14ec64cc2d913c6eda00f5... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [cd932e4778a7da67b8296bd4e384a677397bb5ee]) Npp Official 5.6.2: Fix compilation.
- Made the project compile following the integration to 5.6.2
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/cd932e4778a7da67b8296bd... -
Jocelyn Legault December 17th, 2009 @ 08:47 PM
(from [aeae18bc189e69b7aee5d53b789c237615ac6836]) Merge branch 'npp_official_svn' into jl/LH-29/integrate-npp-5.6.2
- npp_official_svn: [BUG_FIXED] (Author : Vitaliy Dovgan)Fix case-insensitive searching bug for non-ascii characters (for example some characters in French and Cyrillic characters).
Conflicts:
PowerEditor/src/Notepad_plus.cpp PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.cpp PowerEditor/src/ScitillaComponent/xmlMatchedTagsHighlighter.h[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/aeae18bc189e69b7aee5d53... -
Jocelyn Legault December 17th, 2009 @ 11:05 PM
(from [a80c8423b8c5ed50ecaf8e47b71292cd0d98195c]) VCProj: fix post-build steps
- Removed a post-build step copying a file that no longer exists.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/a80c8423b8c5ed50ecaf8e4... -
Jocelyn Legault December 17th, 2009 @ 11:30 PM
(from [8ddf3af4dbf351991c152a2d899833fb805080ab]) FunctionCallTip: move functions from header to cpp.
- Moved isBasicWordChar and isAdditionalWordChar implementations to the source file.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/8ddf3af4dbf351991c152a2... -
Jocelyn Legault December 17th, 2009 @ 11:30 PM
(from [7e117d2c7f8c164d2993260f877ad41d84f7247e]) Menu IDs: Fixed a typo
Changed IDM_SETTING_PREFERECE => IDM_SETTING_PREFERENCE
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/7e117d2c7f8c164d2993260... -
Jocelyn Legault December 17th, 2009 @ 11:30 PM
(from [406f1b58e3cdbce56aa479de1e99ca8ca0551126]) ScintillaEditView: fix variable name typo + spelling
Changed:
_SC_MARGE_LINENUMBER=>_SC_MARGIN_LINENUMBER_SC_MARGE_SYBOLE=>_SC_MARGIN_SYMBOL_SC_MARGE_FOLDER=>_SC_MARGIN_FOLDER_SC_MARGE_MODIFMARKER=>_SC_MARGIN_MODIFMARKER
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/406f1b58e3cdbce56aa479d... -
Jocelyn Legault December 17th, 2009 @ 11:30 PM
(from [8efe59f3dcc1c91862fbcbc6d3086e7ccf507fd5]) Parameters.h: GetNppGUI returns a non-const ref
- GetNppGUI was mostly used to get a non-const ref on parameters' NppGUI. The call was thus modified to reflect the actual use of the function.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/8efe59f3dcc1c91862fbcbc... -
Jocelyn Legault December 21st, 2009 @ 01:37 AM
(from [5331ea3543fdf1553865e0d7effcc8f6c5c7aa97]) Project: Fix the "marge" typo.
- All over the place, the term French "marge" is used instead of "margin.
- Fixed also a "witch" to "which".
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/5331ea3543fdf1553865e0d... -
Jocelyn Legault December 21st, 2009 @ 01:37 AM
(from [6db8673d95288a63c946d5794105229becbeecd8]) Parameters.h: remove useless defines.
- DUP, FREE and NB_LANG were not used anywhere and where removed.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/6db8673d95288a63c946d57... -
Jocelyn Legault December 21st, 2009 @ 01:37 AM
(from [dcedd3c4109faaad4ff0b5c100bc29e8f86ff157]) xmlMatchedTagsHighlighter.cpp: fix typos
- Colouising => Colourising
- Attributs => Attributes
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/dcedd3c4109faaad4ff0b5c... -
Jocelyn Legault December 21st, 2009 @ 01:37 AM
(from [9c91b28661bb61bd4087e3a277eecbe3f0a222ac]) menuCmdID.h: rectify define alignment.
- Defines introduced by N++CR were not respecting the new alignment of the file.
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/9c91b28661bb61bd4087e3a... -
Jocelyn Legault December 21st, 2009 @ 01:37 AM
(from [0a69ce37a3d4fccc3888d570e866a8de3c740c07]) PluginsManager: cleanup header and fix PluginInfo ctor
- Moved the remaining functions in the header to the source file.
- Fixed the order of initialization of members of PluginInfo (LINT)
- Added the missing members from the PluginInfo init list (LINT)
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/joce/npp-community/commit/0a69ce37a3d4fccc3888d57... -
npp-community December 22nd, 2009 @ 12:36 AM
(from [c7b91febc02d12a137305a391e1edbe4d17ceca4]) PluginsManager: cleanup header and fix PluginInfo ctor
- Moved the remaining functions in the header to the source file.
- Fixed the order of initialization of members of PluginInfo (LINT)
- Added the missing members from the PluginInfo init list (LINT)
[#29]
Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
http://github.com/npp-community/npp-community/commit/c7b91febc02d12... -
Thell Fowler December 22nd, 2009 @ 12:36 AM
(from [609d422d19b25945da15e1549ffa9fde53cd5997]) merge cleanup: fix whitespace
- A few of the merges done during integration introduced whitespace errors. Rather than clean them up from the middle of the merge branch this commit fixes them.
[#29]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/npp-community/npp-community/commit/609d422d19b259... -
Thell Fowler December 22nd, 2009 @ 12:36 AM
(from [ad17125fe3e316d79c63a4e7b146c082347a24a0]) Merge branch 'jl/npp_svn_integration' into next
- jl/npp_svn_integration: (67 commits) merge cleanup: fix whitespace PluginsManager: cleanup header and fix PluginInfo ctor xmlMatchedTagsHighlighter.cpp: fix typos menuCmdID.h: rectify define alignment. Parameters.h: remove useless defines. Project: Fix the "marge" typo. Parameters.h: GetNppGUI returns a non-const ref ScintillaEditView: fix variable name typo + spelling Menu IDs: Fixed a typo FunctionCallTip: move functions from header to cpp. VCProj: fix post-build steps Npp Official 5.6.2: Fix compilation. Npp Official 5.6.1: Fix the lint warnings Npp Official 5.6.1: Fix compilation. Npp Official 5.6: Fix the lint warnings Npp Official 5.6: Fix compilation. Npp Official integration: Fix the lint warnings Npp Official 5.5.1: Fix compilation. [RELEASE] Notepad++ v5.6.2 [BUG_FIXED] Fix the Unicode localization file display incident. [UPDATE] Update 3 localization files : English, French and Chinese. [BUG_FIXED] Fix tag highlighting bug while disabling indent guide lines. [BUG_FIXED] Fix the translated sub menu entries applying on the menu item. [RELEASE] Notepad++ v5.6.1 release. [NEW] unfold while jumping markers. [UPDATE] Update the localization files. [BUG_FIXED] Fix localization combo box unselected in preference dialog bug... [NEW] Add find result commands in the menu. [CLEAN] Move EOL format items to sub menu Edit. [BUG_FIXED] (Author : Vitaliy Dovgan)Fix case-insensitive searching bug... [BUG_FIXED] Fix brace highlighting breaking issue. [BUG_FIXED] Fix the Context menu installation in installer. [RELEASE] Notepad++ v5.6 release. [BUG_FIXED] Fix the Unicode to ANSI encoding bug. [NEW_FEATURE] Add auto-detection of HTML/XML file encoding. [ADD] Add the style themes. [NEW_FEATURE] Add indent guide line highlighting for html/xml tags. [ADD] Add the forgotten symbols. [NEW] Add new encodings. [BUG_FIXED] Fix encoding files loading bug. [NEW] File Encoding is remembered in the session. [NEW] Add new encodings, make status bar work for the new encodings. [NEW] Add Chinese simplified, Japanese, Korean, Thai... encodings. [NEW_FEATURE] Add Chinese BIG5 encoding (in progress). [NEW] Add Kyrgyz language file. [NEW] Make Marker Jumper wrap able. [NEW_FEATURE] Add Marker Jumper feature. [BUG_FIXED] Fix systemtray close crash bug. [BUG_FIXED] Provide a walk around solution for the wrap symbol display... [NEW_FEATURE] (Author : Slurdge) Add system tray context menu and new... [NEW_MINOR_FEATURE] Add the ability to add the second keyword group for... [BUG_FIXED] Fix Calltip hint bug and add a new capacity in it. [NEW] Add D, R, PowerShell and COBOL keywords and colour settings. [NEW] Add SQL ESC symbol ''. [NEW_FEATURE] Add COBOL, D, Gui4Cli, PowerShell and R language support. [NEW_FEATURE] Add COBOL, D, Gui4Cli, PowerShell and R language support (in... [BUG_FIXED] Fix column editor insert number bug in virtual space mode. [BUG_FIXED] Fixed status bar displaying "-2 char" issue for a empty... [RELEASE] v5.5.1 release. [NEW_FEATURE] (Author : Christian Cuvier) characters count is added in... [NEW_FEATURE] Add plugin Black list. [BUG_FIXED] Fix file ext unexpected behaviour. [NEW_FEATURE] Try to catch plugin crash. NppShell: Replaced nppcm with NppShell. [NEW_FEATURE] Set extension automatically (according to set document... [RELEASE] Release v5.5 bis : Add Plugin Manager in installer.
[#29]
Signed-off-by: Thell Fowler git@tbfowler.name
http://github.com/npp-community/npp-community/commit/ad17125fe3e316... -
Thell Fowler December 22nd, 2009 @ 05:50 PM
- State changed from “open” to “candidate”
- Assigned user changed from “Jocelyn Legault” to “npp-community”
Woops, forgot to update the state.
-
Thell Fowler January 19th, 2010 @ 12:02 AM
(from [2e83af48bf01af9f6cb1a57683ffc494aec9d76f]) Merge branch 'jl/npp_svn_integration'
- jl/npp_svn_integration: (67 commits) merge cleanup: fix whitespace PluginsManager: cleanup header and fix PluginInfo ctor xmlMatchedTagsHighlighter.cpp: fix typos menuCmdID.h: rectify define alignment. Parameters.h: remove useless defines. Project: Fix the "marge" typo. Parameters.h: GetNppGUI returns a non-const ref ScintillaEditView: fix variable name typo + spelling Menu IDs: Fixed a typo FunctionCallTip: move functions from header to cpp. VCProj: fix post-build steps Npp Official 5.6.2: Fix compilation. Npp Official 5.6.1: Fix the lint warnings Npp Official 5.6.1: Fix compilation. Npp Official 5.6: Fix the lint warnings Npp Official 5.6: Fix compilation. Npp Official integration: Fix the lint warnings Npp Official 5.5.1: Fix compilation. [RELEASE] Notepad++ v5.6.2 [BUG_FIXED] Fix the Unicode localization file display incident. [UPDATE] Update 3 localization files : English, French and Chinese. [BUG_FIXED] Fix tag highlighting bug while disabling indent guide lines. [BUG_FIXED] Fix the translated sub menu entries applying on the menu item. [RELEASE] Notepad++ v5.6.1 release. [NEW] unfold while jumping markers. [UPDATE] Update the localization files. [BUG_FIXED] Fix localization combo box unselected in preference dialog bug... [NEW] Add find result commands in the menu. [CLEAN] Move EOL format items to sub menu Edit. [BUG_FIXED] (Author : Vitaliy Dovgan)Fix case-insensitive searching bug... [BUG_FIXED] Fix brace highlighting breaking issue. [BUG_FIXED] Fix the Context menu installation in installer. [RELEASE] Notepad++ v5.6 release. [BUG_FIXED] Fix the Unicode to ANSI encoding bug. [NEW_FEATURE] Add auto-detection of HTML/XML file encoding. [ADD] Add the style themes. [NEW_FEATURE] Add indent guide line highlighting for html/xml tags. [ADD] Add the forgotten symbols. [NEW] Add new encodings. [BUG_FIXED] Fix encoding files loading bug. [NEW] File Encoding is remembered in the session. [NEW] Add new encodings, make status bar work for the new encodings. [NEW] Add Chinese simplified, Japanese, Korean, Thai... encodings. [NEW_FEATURE] Add Chinese BIG5 encoding (in progress). [NEW] Add Kyrgyz language file. [NEW] Make Marker Jumper wrap able. [NEW_FEATURE] Add Marker Jumper feature. [BUG_FIXED] Fix systemtray close crash bug. [BUG_FIXED] Provide a walk around solution for the wrap symbol display... [NEW_FEATURE] (Author : Slurdge) Add system tray context menu and new... [NEW_MINOR_FEATURE] Add the ability to add the second keyword group for... [BUG_FIXED] Fix Calltip hint bug and add a new capacity in it. [NEW] Add D, R, PowerShell and COBOL keywords and colour settings. [NEW] Add SQL ESC symbol ''. [NEW_FEATURE] Add COBOL, D, Gui4Cli, PowerShell and R language support. [NEW_FEATURE] Add COBOL, D, Gui4Cli, PowerShell and R language support (in... [BUG_FIXED] Fix column editor insert number bug in virtual space mode. [BUG_FIXED] Fixed status bar displaying "-2 char" issue for a empty... [RELEASE] v5.5.1 release. [NEW_FEATURE] (Author : Christian Cuvier) characters count is added in... [NEW_FEATURE] Add plugin Black list. [BUG_FIXED] Fix file ext unexpected behaviour. [NEW_FEATURE] Try to catch plugin crash. NppShell: Replaced nppcm with NppShell. [NEW_FEATURE] Set extension automatically (according to set document... [RELEASE] Release v5.5 bis : Add Plugin Manager in installer.
[#29]
Signed-off-by: Thell Fowler git@tbfowler.name http://github.com/npp-community/npp-community/commit/2e83af48bf01af...
-
Thell Fowler January 19th, 2010 @ 12:04 AM
- State changed from “candidate” to “resolved”
Not sure why this didn't carry over from Github but this has been promoted.
http://github.com/npp-community/npp-community/commit/2e83af48bf01af...
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.
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
Notepad++ Community Release
People watching this ticket
Jocelyn Legault
npp-community
Referenced by
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]
-
29
[Update] Integrate N++ 5.6.1 to N++CR
[#29]