Changeset [e77a7d07643a5058279f4e06448e0f2ef4a9d50d] by Jocelyn Legault

Revision e77a7d07643a5058279f4e06448e0f2ef4a9d50d, committed by Jocelyn Legault · October 12th, 2010 @ 01:30 AM

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...

256 changed files

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