Lighthouse has a new layout. Prefer the old one? Return to the old layout, and switch back any time from the link at the top of each page.

Integrate N++ 5.7

#45

Need to integrate N++ 5.7 to N++CR

Reported by Jocelyn Legault · September 14th, 2010 @ 02:29 AM

State: resolved
Milestone: v2.0.0
Assigned to: nobody

Activity

  1. npp-community
    npp-community

    (from [49095327c686dc4f4404abdf4c3bc1e13adca77a]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [UPDATE] Complete Scintilla source files.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/npp-community/npp-community/commit/49095327c686dc...

    October 29th, 2010 @ 11:04 PM

  2. npp-community
    npp-community

    (from [4fdb744960b0c2eb3283ab1115c9e5f2e60deb3e]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] (Author: Christian Cuvier) Fix crashes on new 11 character long UDL names bug.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/npp-community/npp-community/commit/4fdb744960b0c2...

    October 29th, 2010 @ 11:04 PM

  3. npp-community
    npp-community

    (from [8cdb82f7d40b07a50f3710c2140b58967e806521]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [UPDATE] Update Scintilla from 2.0.1 to 2.1.2

    Conflicts:

    scintilla/include/Scintilla.h
    scintilla/src/CallTip.h
    scintilla/src/DocumentAccessor.h
    scintilla/src/Editor.cxx
    scintilla/src/Editor.h
    scintilla/src/LexErlang.cxx
    scintilla/src/ScintillaBase.h
    scintilla/src/StyleContext.h
    scintilla/vcbuild/SciLexer.dsp
    scintilla/win32/PlatWin.cxx
    scintilla/win32/ScintRes.rc
    scintilla/win32/ScintillaWin.cxx
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/npp-community/npp-community/commit/8cdb82f7d40b07...

    October 29th, 2010 @ 11:04 PM

  4. npp-community
    npp-community

    (from [b8f09b56a7cf1f7126026244b5025d3db11d0c75]) Remove all the Mac OS stuff.

    We don't need it and it just takes place for no reason.
    Was brought in by the latest merge.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/npp-community/npp-community/commit/b8f09b56a7cf1f...

    October 29th, 2010 @ 11:04 PM

  5. npp-community
    npp-community

    (from [b3b70ff96c9b917c2cf93540d1890c4c10f8f3ef]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [NEW] Regroup bookmark operation menu commands under "Bookmark" menu folder.

    Conflicts:

    PowerEditor/src/Notepad_plus.rc
    PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/npp-community/npp-community/commit/b3b70ff96c9b91...

    October 29th, 2010 @ 11:04 PM

  6. npp-community
    npp-community

    (from [f3b47eb4ca01306b85462f29bd49e3676698f9d4]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [CLEAN] throw runtime_error instead of int.

    Conflicts:

    PowerEditor/src/Parameters.cpp
    PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
    PowerEditor/src/ScintillaComponent/GoToLineDlg.h
    PowerEditor/src/ScintillaComponent/columnEditor.h
    PowerEditor/src/WinControls/SplitterContainer/Splitter.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/npp-community/npp-community/commit/f3b47eb4ca0130...

    October 29th, 2010 @ 11:04 PM

  7. Thell Fowler
    Thell Fowler
    • State changed from acked to resolved
    • Assigned user cleared.

    Integrated into master.

    October 29th, 2010 @ 11:17 PM

  8. Jocelyn Legault
    Jocelyn Legault

    (from [9103fc862de3faa62f435338bf082061c3022330]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Restore zoom settings saving for both scintilla controls.

    Conflicts:

    PowerEditor/src/Notepad_plus.cpp
    PowerEditor/src/NppBigSwitch.cpp
    PowerEditor/src/Parameters.h
    PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/9103fc862de3faa62f43533...

    October 31st, 2010 @ 05:48 AM

  9. Jocelyn Legault
    Jocelyn Legault

    (from [e60cd5ec965bc243fba29544df52c93bee3b3342]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [NEW_FEATURE]

    • Add line wrap methods.
    • Make folding margin hidable.
    • One set of settings are applied in 2 scintilla controls.

    Conflicts:

    PowerEditor/src/Notepad_plus.cpp
    PowerEditor/src/Notepad_plus.h
    PowerEditor/src/NppCommands.cpp
    PowerEditor/src/Parameters.h
    PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
    PowerEditor/src/ScintillaComponent/ScintillaEditView.h
    PowerEditor/src/ScitillaComponent/ScintillaRef.h
    PowerEditor/src/WinControls/Preference/preference.rc
    PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
    PowerEditor/src/WinControls/Preference/preferenceDlg.h
    PowerEditor/src/WinControls/Preference/preference_rc.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/e60cd5ec965bc243fba2954...

    October 31st, 2010 @ 05:48 AM

  10. Jocelyn Legault
    Jocelyn Legault

    (from [8a3e2aa886e9fbe8bdc45eafa2725c6a57995fc1]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [NEW_FEATURE] Add 2 menu commands : "Modify Shortcut/Delete Macro" and "Modify Shortcut/Delete Command".

    [NEW] Add "Modify" and "Delete" buttons on Shortcut mapper dialog. [BUG_FIXED] Fix Shortcut Mapper inconsistence issue after deleting a macro or an user command. [NEW] Add NPPM_GETCURRENTNATIVELANGENCODING message (to get the current native language enconding). [UPDATE] Update native languages files: english.xml, french.xml and chinese.xml . [BUG_FIXED] Remove characters count feature from the status bar due to its performance issue with UTF8 file.

    Conflicts:

    PowerEditor/src/NppBigSwitch.cpp
    PowerEditor/src/NppCommands.cpp
    PowerEditor/src/WinControls/Grid/ShortcutMapper.cpp
    PowerEditor/src/WinControls/Grid/ShortcutMapper.h
    PowerEditor/src/menuCmdID.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/8a3e2aa886e9fbe8bdc45ea...

    October 31st, 2010 @ 05:48 AM

  11. Jocelyn Legault
    Jocelyn Legault

    (from [c3f5fcc12c43499bf90b53b5e0fc6e5788206b74]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [NEW_FEATURE] (Author: Christian Cuvier) Add macro new ability to record search and replace actions.

    Conflicts:

    PowerEditor/src/MISC/Common/Common.h
    PowerEditor/src/Notepad_plus.cpp
    PowerEditor/src/Notepad_plus.h
    PowerEditor/src/NppCommands.cpp
    PowerEditor/src/Parameters.cpp
    PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
    PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
    PowerEditor/src/ScintillaComponent/FindReplaceDlg_rc.h
    PowerEditor/src/WinControls/shortcut/RunMacroDlg.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/c3f5fcc12c43499bf90b53b...

    October 31st, 2010 @ 05:48 AM

  12. Jocelyn Legault
    Jocelyn Legault

    (from [17399d49abea5a6afeb3561624523b5a19fdf57b]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    (Author: Francois-R Boyer) Fix DBCS encodings file saving corruption bug.

    Conflicts:

    PowerEditor/src/MISC/Common/Common.cpp
    PowerEditor/src/MISC/Common/Common.h
    PowerEditor/src/Notepad_plus.cpp
    PowerEditor/src/NppBigSwitch.cpp
    PowerEditor/src/ScintillaComponent/Buffer.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/17399d49abea5a6afeb3561...

    October 31st, 2010 @ 05:48 AM

  13. Jocelyn Legault
    Jocelyn Legault

    (from [6109d55249eef9ec680d4b302b7033573e304ebc]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] (Author: Dave Brotherstone) Fix SaveSession bug.

    Conflicts:

    PowerEditor/src/Notepad_plus.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/6109d55249eef9ec680d4b3...

    October 31st, 2010 @ 05:48 AM

  14. Jocelyn Legault
    Jocelyn Legault

    (from [3e717a4cfd9ed09a0769d57f6818f80a859d1898]) Fix Common.h

    Put back operator T*() to WcharMbcsConvertor::StringBuffer. Was removed in a
    prior integration by mistake and code failed to compile because of this.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/3e717a4cfd9ed09a0769d57...

    October 31st, 2010 @ 05:48 AM

  15. Jocelyn Legault
    Jocelyn Legault

    (from [5e33e21625459ae3428076d6294aa6acde482e3f]) Move TinyXML header files to the precompiled header.

    TinyXML headers were starting to creep up everywhere.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/5e33e21625459ae3428076d...

    October 31st, 2010 @ 05:48 AM

  16. Jocelyn Legault
    Jocelyn Legault

    (from [e77a7d07643a5058279f4e06448e0f2ef4a9d50d]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [UPDATE] Update Scintilla from 2.12 to 2.20

    Conflicts:

    scintilla/cocoa/Framework.mk
    scintilla/cocoa/SciTest.mk
    scintilla/cocoa/ScintillaCocoa.h
    scintilla/cocoa/ScintillaCocoa.mm
    scintilla/cocoa/ScintillaFramework/English.lproj/InfoPlist.strings
    scintilla/cocoa/ScintillaFramework/ScintillaFramework.xcodeproj/project.pbxproj
    scintilla/cocoa/ScintillaTest/AppController.h
    scintilla/cocoa/ScintillaTest/AppController.mm
    scintilla/cocoa/ScintillaTest/English.lproj/InfoPlist.strings
    scintilla/cocoa/ScintillaTest/English.lproj/MainMenu.xib
    scintilla/cocoa/ScintillaView.h
    scintilla/cocoa/ScintillaView.mm
    scintilla/doc/Design.html
    scintilla/doc/Icons.html
    scintilla/doc/SciCoding.html
    scintilla/doc/ScintillaDoc.html
    scintilla/doc/ScintillaDownload.html
    scintilla/doc/ScintillaHistory.html
    scintilla/doc/ScintillaRelated.html
    scintilla/doc/ScintillaToDo.html
    scintilla/doc/ScintillaUsage.html
    scintilla/doc/Steps.html
    scintilla/doc/index.html
    scintilla/include/Scintilla.h
    scintilla/lexers/LexAPDL.cxx
    scintilla/lexers/LexASY.cxx
    scintilla/lexers/LexAU3.cxx
    scintilla/lexers/LexAVE.cxx
    scintilla/lexers/LexAbaqus.cxx
    scintilla/lexers/LexAda.cxx
    scintilla/lexers/LexAsm.cxx
    scintilla/lexers/LexAsn1.cxx
    scintilla/lexers/LexBaan.cxx
    scintilla/lexers/LexBash.cxx
    scintilla/lexers/LexBasic.cxx
    scintilla/lexers/LexBullant.cxx
    scintilla/lexers/LexCLW.cxx
    scintilla/lexers/LexCOBOL.cxx
    scintilla/lexers/LexCSS.cxx
    scintilla/lexers/LexCaml.cxx
    scintilla/lexers/LexCmake.cxx
    scintilla/lexers/LexConf.cxx
    scintilla/lexers/LexCrontab.cxx
    scintilla/lexers/LexCsound.cxx
    scintilla/lexers/LexD.cxx
    scintilla/lexers/LexEScript.cxx
    scintilla/lexers/LexEiffel.cxx
    scintilla/lexers/LexErlang.cxx
    scintilla/lexers/LexFlagship.cxx
    scintilla/lexers/LexForth.cxx
    scintilla/lexers/LexFortran.cxx
    scintilla/lexers/LexGAP.cxx
    scintilla/lexers/LexGui4Cli.cxx
    scintilla/lexers/LexHTML.cxx
    scintilla/lexers/LexHaskell.cxx
    scintilla/lexers/LexInno.cxx
    scintilla/lexers/LexKix.cxx
    scintilla/lexers/LexLisp.cxx
    scintilla/lexers/LexLout.cxx
    scintilla/lexers/LexLua.cxx
    scintilla/lexers/LexMMIXAL.cxx
    scintilla/lexers/LexMPT.cxx
    scintilla/lexers/LexMSSQL.cxx
    scintilla/lexers/LexMagik.cxx
    scintilla/lexers/LexMarkdown.cxx
    scintilla/lexers/LexMatlab.cxx
    scintilla/lexers/LexMetapost.cxx
    scintilla/lexers/LexMySQL.cxx
    scintilla/lexers/LexNimrod.cxx
    scintilla/lexers/LexNsis.cxx
    scintilla/lexers/LexOpal.cxx
    scintilla/lexers/LexOthers.cxx
    scintilla/lexers/LexPB.cxx
    scintilla/lexers/LexPLM.cxx
    scintilla/lexers/LexPOV.cxx
    scintilla/lexers/LexPS.cxx
    scintilla/lexers/LexPascal.cxx
    scintilla/lexers/LexPerl.cxx
    scintilla/lexers/LexPowerPro.cxx
    scintilla/lexers/LexPowerShell.cxx
    scintilla/lexers/LexProgress.cxx
    scintilla/lexers/LexPython.cxx
    scintilla/lexers/LexR.cxx
    scintilla/lexers/LexRebol.cxx
    scintilla/lexers/LexRuby.cxx
    scintilla/lexers/LexSML.cxx
    scintilla/lexers/LexSQL.cxx
    scintilla/lexers/LexScriptol.cxx
    scintilla/lexers/LexSmalltalk.cxx
    scintilla/lexers/LexSorcus.cxx
    scintilla/lexers/LexSpecman.cxx
    scintilla/lexers/LexSpice.cxx
    scintilla/lexers/LexTACL.cxx
    scintilla/lexers/LexTADS3.cxx
    scintilla/lexers/LexTAL.cxx
    scintilla/lexers/LexTCL.cxx
    scintilla/lexers/LexTeX.cxx
    scintilla/lexers/LexVB.cxx
    scintilla/lexers/LexVHDL.cxx
    scintilla/lexers/LexVerilog.cxx
    scintilla/lexers/LexYAML.cxx
    scintilla/lexlib/PropSetSimple.cxx
    scintilla/lexlib/StyleContext.cxx
    scintilla/lexlib/StyleContext.h
    scintilla/macosx/PlatMacOSX.cxx
    scintilla/macosx/SciTest/English.lproj/InfoPlist.strings
    scintilla/macosx/SciTest/SciTest.xcode/project.pbxproj
    scintilla/macosx/ScintillaMacOSX.h
    scintilla/macosx/deps.mak
    scintilla/macosx/makefile
    scintilla/src/AutoComplete.cxx
    scintilla/src/CharClassify.cxx
    scintilla/src/CharacterSet.h
    scintilla/src/Document.cxx
    scintilla/src/DocumentAccessor.cxx
    scintilla/src/DocumentAccessor.h
    scintilla/src/Editor.cxx
    scintilla/src/ExternalLexer.cxx
    scintilla/src/KeyWords.cxx
    scintilla/src/LexCPP.cxx
    scintilla/src/ScintillaBase.cxx
    scintilla/src/WindowAccessor.cxx
    scintilla/vcbuild/SciLexer.dsp
    scintilla/win32/PlatWin.cxx
    scintilla/win32/ScintRes.rc
    scintilla/win32/ScintillaWin.cxx
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/e77a7d07643a5058279f4e0...

    October 31st, 2010 @ 05:48 AM

  17. Jocelyn Legault
    Jocelyn Legault

    (from [07c8944ccf4427c72c250a9d1166987aa641b907]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Fix crash issue due to themes switching.

    Conflicts:

    PowerEditor/src/Notepad_plus_Window.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/07c8944ccf4427c72c250a9...

    October 31st, 2010 @ 05:48 AM

  18. Jocelyn Legault
    Jocelyn Legault

    (from [da6a43dffe9ed15fe58e65f0ecbd6bd164f61239]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [UPDATE] Adapt LexObjC LexSearchResult and LexUser to a new configuration.

    Conflicts:

    scintilla/lexers/LexObjC.cxx
    scintilla/lexers/LexSearchResult.cxx
    scintilla/lexers/LexUser.cxx
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/da6a43dffe9ed15fe58e65f...

    October 31st, 2010 @ 05:48 AM

  19. Jocelyn Legault
    Jocelyn Legault

    (from [d1adbb3998ed6a19c65723720f43dbd82911dfc2]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [UPDATE] Update the readmeFirst.txt for the build information.

    Conflicts:

    PowerEditor/src/MISC/Common/Common.h
    PowerEditor/src/ScintillaComponent/Printer.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/d1adbb3998ed6a19c657237...

    October 31st, 2010 @ 05:48 AM

  20. Jocelyn Legault
    Jocelyn Legault

    (from [50daf49db280455cae6f68c18b50fdb71ec35989]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] (Author: Francois-R Boyer) Fix Unicode file corrupted on saving bug (the buffer alignment issue).

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/50daf49db280455cae6f68c...

    October 31st, 2010 @ 05:48 AM

  21. Jocelyn Legault
  22. Jocelyn Legault
    Jocelyn Legault

    (from [75ebf7abbe263f9f7d9d6a51c3db585b01f2a4db]) Remove unused Scintilla files.

    Removed cocoa, MacOS and gtk files that we have no use for.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/75ebf7abbe263f9f7d9d6a5...

    October 31st, 2010 @ 05:48 AM

  23. Jocelyn Legault
    Jocelyn Legault

    (from [df70964855fe997607c7ec46e6001208040186fd]) Remove useless headers in source files.

    Headers already present in the precompiled header were present in some source
    file and were commented out.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/df70964855fe997607c7ec4...

    October 31st, 2010 @ 05:48 AM

  24. Jocelyn Legault
    Jocelyn Legault

    (from [0f3c50dbba8e574d6d73f8516a1e0781391b4f3b]) Adjust headers files listed in the VC9 vcproj.

    Some header files were not present and some were leftovers from before the
    last integration. Everything is up to date now. The headers are already okay
    in the VC8 vcproj.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/0f3c50dbba8e574d6d73f85...

    October 31st, 2010 @ 05:48 AM

  25. Jocelyn Legault
    Jocelyn Legault

    (from [67594409657d0eecd4fe1b01082fa56332e0bf9c]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Fix macro recoding for find in files regression.

    Conflicts:

    PowerEditor/src/ScintillaComponent/FindReplaceDlg.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/67594409657d0eecd4fe1b0...

    October 31st, 2010 @ 05:48 AM

  26. Jocelyn Legault
    Jocelyn Legault

    (from [4f4435bbd0937905e1356218b4a81f83c42a873e]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Remove selected character count from status bar due to the performance issue.

    Conflicts:

    PowerEditor/src/Notepad_plus.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/joce/npp-community/commit/4f4435bbd0937905e135621...

    October 31st, 2010 @ 05:48 AM

  27. Thell Fowler
    Thell Fowler

    (from [7b43bb88b1acb30a8a7ed73995f3c63199d7f092]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Fix Lexer SearchResult syntax highlighting bug.

    Conflicts:

    PowerEditor/src/ScintillaComponent/FindReplaceDlg.cpp
    scintilla/lexers/LexSearchResult.cxx
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/7b43bb88b1ac...

    October 31st, 2010 @ 11:27 PM

  28. Thell Fowler
    Thell Fowler

    (from [dca251b19b0d31abba4635d1600c6f2ca29468e3]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] (Author: François-R Boyer) Avoid "#if 1 //" from making CppLexer crash.

    [UPDATE] Update english.xml for v5.7.1 and the newest translations.

    Conflicts:

    PowerEditor/src/WinControls/Window.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/dca251b19b0d...

    October 31st, 2010 @ 11:27 PM

  29. Thell Fowler
    Thell Fowler

    (from [09fc88a4ffa9805b94a09557bde64fa2badd5854]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Fix a vulnerability: get full ScinLexer.dll path to avoid hijack.

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/09fc88a4ffa9...

    October 31st, 2010 @ 11:27 PM

  30. Thell Fowler
    Thell Fowler

    (from [0482d5971cb99c1e34d7141bf46cf9cc5b152310]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] (Author: jgr [SF user name: joerngr]) Fix dragging undocked window performance issue while using Vista Aero

    Conflicts:

    PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
    PowerEditor/src/WinControls/DockingWnd/Gripper.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/0482d5971cb9...

    October 31st, 2010 @ 11:27 PM

  31. Thell Fowler
    Thell Fowler

    (from [ea24a82ab7f0aa96d155240a06c8a91e4ffb79fe]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Fix "Select and Find Next" and "Count" regressions.

    Conflicts:

    PowerEditor/src/NppCommands.cpp
    PowerEditor/src/ScintillaComponent/ScintillaEditView.h
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/ea24a82ab7f0...

    October 31st, 2010 @ 11:27 PM

  32. Thell Fowler
    Thell Fowler

    (from [e98386ebf16c41a7ef38195686e1fe976ec8ac83]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] Fix the menu items settings non-memorized regression.

    Conflicts:

    PowerEditor/src/NppCommands.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/e98386ebf16c...

    October 31st, 2010 @ 11:27 PM

  33. Thell Fowler
    Thell Fowler

    (from [50447f27052f0d0eba08c9158938a863534dc16c]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [UPDATE] Update Scintilla to v2.21.

    Conflicts:

    scintilla/cocoa/Framework.mk
    scintilla/gtk/PlatGTK.cxx
    scintilla/gtk/ScintillaGTK.cxx
    scintilla/gtk/deps.mak
    scintilla/gtk/makefile
    scintilla/lexers/LexPowerPro.cxx
    scintilla/macosx/ScintillaMacOSX.cxx
    scintilla/macosx/ScintillaMacOSX.h
    scintilla/vcbuild/SciLexer.dsp
    scintilla/win32/ScintRes.rc
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/50447f27052f...

    October 31st, 2010 @ 11:27 PM

  34. Thell Fowler
    Thell Fowler

    (from [27579e8962f131e1736baa2a344bc602392e1b71]) Merge branch 'npp_official_svn' into jl/LH-45/integrate-npp-svn

    [BUG_FIXED] (Author: Francois-R Boyer) Fix large file truncated after loading.

    Conflicts:

    PowerEditor/src/ScintillaComponent/Buffer.cpp
    

    [#45]

    Signed-off-by: Jocelyn Legault jocelynlegault@gmail.com
    http://github.com/almostautomated/npp-community/commit/27579e8962f1...

    October 31st, 2010 @ 11:27 PM

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.