[rsyntaxtextarea] 02/03: Merge tag 'upstream/2.5.0'
Benjamin Mesing
ben at alioth.debian.org
Sun Oct 20 20:42:12 UTC 2013
This is an automated email from the git hooks/post-receive script.
ben pushed a commit to branch master
in repository rsyntaxtextarea.
commit d91fc951b9cced450ba43ff1e3eab064ec107917
Merge: 03a7b82 397000d
Author: Benjamin Mesing <bensmail at gmx.net>
Date: Sun Oct 20 21:50:40 2013 +0200
Merge tag 'upstream/2.5.0'
Upstream version 2.5.0
build.xml | 15 +-
distfiles/readme.txt | 21 +-
src/org/fife/io/DocumentReader.java | 9 +
src/org/fife/io/UnicodeReader.java | 2 +
src/org/fife/io/UnicodeWriter.java | 5 +
.../rsyntaxtextarea/AbstractJFlexCTokenMaker.java | 16 +-
.../rsyntaxtextarea/AbstractTokenMakerFactory.java | 8 +-
.../ChangeableColorHighlightPainter.java | 1 +
.../ui/rsyntaxtextarea/CodeTemplateManager.java | 24 +-
.../rsyntaxtextarea/DefaultOccurrenceMarker.java | 6 +-
.../ui/rsyntaxtextarea/DefaultTokenFactory.java | 24 +-
.../rsyntaxtextarea/DefaultTokenMakerFactory.java | 2 +
.../ui/rsyntaxtextarea/DefaultTokenPainter.java | 39 +-
src/org/fife/ui/rsyntaxtextarea/DocumentRange.java | 1 +
src/org/fife/ui/rsyntaxtextarea/ErrorStrip.java | 74 +-
.../fife/ui/rsyntaxtextarea/FileFileLocation.java | 7 +
.../rsyntaxtextarea/FoldingAwareIconRowHeader.java | 1 +
.../MarkOccurrencesHighlightPainter.java | 2 +
.../ui/rsyntaxtextarea/MarkOccurrencesSupport.java | 6 +-
src/org/fife/ui/rsyntaxtextarea/ParserManager.java | 45 +-
.../fife/ui/rsyntaxtextarea/RSyntaxDocument.java | 38 +-
.../fife/ui/rsyntaxtextarea/RSyntaxTextArea.java | 136 +-
.../rsyntaxtextarea/RSyntaxTextAreaEditorKit.java | 76 +-
.../RSyntaxTextAreaHighlighter.java | 81 +-
.../fife/ui/rsyntaxtextarea/RSyntaxTextAreaUI.java | 9 +
.../fife/ui/rsyntaxtextarea/RSyntaxUtilities.java | 118 +-
src/org/fife/ui/rsyntaxtextarea/RTfToText.java | 14 +-
src/org/fife/ui/rsyntaxtextarea/RtfGenerator.java | 73 +-
.../fife/ui/rsyntaxtextarea/RtfTransferable.java | 2 +-
.../SquiggleUnderlineHighlightPainter.java | 1 +
src/org/fife/ui/rsyntaxtextarea/Style.java | 4 +
.../fife/ui/rsyntaxtextarea/SyntaxConstants.java | 6 +
src/org/fife/ui/rsyntaxtextarea/SyntaxScheme.java | 128 +-
src/org/fife/ui/rsyntaxtextarea/SyntaxView.java | 57 +-
.../fife/ui/rsyntaxtextarea/TextEditorPane.java | 9 +-
src/org/fife/ui/rsyntaxtextarea/Theme.java | 9 +-
src/org/fife/ui/rsyntaxtextarea/Token.java | 742 +-----
src/org/fife/ui/rsyntaxtextarea/TokenFactory.java | 6 +-
src/org/fife/ui/rsyntaxtextarea/TokenImpl.java | 836 ++++++
.../fife/ui/rsyntaxtextarea/TokenMakerBase.java | 20 +-
.../fife/ui/rsyntaxtextarea/TokenMakerFactory.java | 2 +-
src/org/fife/ui/rsyntaxtextarea/TokenMap.java | 1 +
src/org/fife/ui/rsyntaxtextarea/TokenTypes.java | 2 +-
src/org/fife/ui/rsyntaxtextarea/TokenUtils.java | 166 ++
.../fife/ui/rsyntaxtextarea/URLFileLocation.java | 7 +
.../VisibleWhitespaceTokenPainter.java | 27 +-
.../fife/ui/rsyntaxtextarea/WrappedSyntaxView.java | 136 +-
.../ui/rsyntaxtextarea/XmlOccurrenceMarker.java | 32 +-
.../rsyntaxtextarea/focusabletip/FocusableTip.java | 2 +
.../ui/rsyntaxtextarea/focusabletip/SizeGrip.java | 8 +-
.../ui/rsyntaxtextarea/focusabletip/TipUtil.java | 2 +-
.../ui/rsyntaxtextarea/focusabletip/TipWindow.java | 7 +
.../rsyntaxtextarea/folding/CurlyFoldParser.java | 22 +-
src/org/fife/ui/rsyntaxtextarea/folding/Fold.java | 25 +-
.../ui/rsyntaxtextarea/folding/FoldCollapser.java | 10 +-
.../ui/rsyntaxtextarea/folding/FoldManager.java | 45 +-
.../ui/rsyntaxtextarea/folding/FoldParser.java | 2 +-
.../rsyntaxtextarea/folding/FoldParserManager.java | 12 +-
.../ui/rsyntaxtextarea/folding/HtmlFoldParser.java | 47 +-
.../ui/rsyntaxtextarea/folding/JsonFoldParser.java | 24 +-
.../rsyntaxtextarea/folding/LatexFoldParser.java | 16 +-
.../ui/rsyntaxtextarea/folding/LispFoldParser.java | 2 +
.../ui/rsyntaxtextarea/folding/NsisFoldParser.java | 24 +-
.../ui/rsyntaxtextarea/folding/XmlFoldParser.java | 18 +-
.../modes/AbstractMarkupTokenMaker.java | 2 +
.../modes/ActionScriptTokenMaker.flex | 4 +-
.../modes/ActionScriptTokenMaker.java | 7 +-
.../modes/AssemblerX86TokenMaker.flex | 4 +-
.../modes/AssemblerX86TokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/BBCodeTokenMaker.flex | 5 +-
.../ui/rsyntaxtextarea/modes/BBCodeTokenMaker.java | 8 +-
.../rsyntaxtextarea/modes/CPlusPlusTokenMaker.flex | 4 +-
.../rsyntaxtextarea/modes/CPlusPlusTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/CSSTokenMaker.flex | 3 +-
.../ui/rsyntaxtextarea/modes/CSSTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/CSharpTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/CSharpTokenMaker.java | 7 +-
.../fife/ui/rsyntaxtextarea/modes/CTokenMaker.flex | 4 +-
.../fife/ui/rsyntaxtextarea/modes/CTokenMaker.java | 7 +-
.../rsyntaxtextarea/modes/ClojureTokenMaker.flex | 6 +-
.../rsyntaxtextarea/modes/ClojureTokenMaker.java | 2802 ++++++++++----------
.../ui/rsyntaxtextarea/modes/DelphiTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/DelphiTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/DtdTokenMaker.flex | 3 +-
.../ui/rsyntaxtextarea/modes/DtdTokenMaker.java | 7 +-
.../rsyntaxtextarea/modes/FortranTokenMaker.flex | 4 +-
.../rsyntaxtextarea/modes/FortranTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/GroovyTokenMaker.flex | 12 +-
.../ui/rsyntaxtextarea/modes/GroovyTokenMaker.java | 15 +-
.../ui/rsyntaxtextarea/modes/HTMLTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/HTMLTokenMaker.java | 7 +-
...{XMLTokenMaker.flex => HtaccessTokenMaker.flex} | 411 +--
.../rsyntaxtextarea/modes/HtaccessTokenMaker.java | 1505 +++++++++++
.../ui/rsyntaxtextarea/modes/JSPTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/JSPTokenMaker.java | 7 +-
.../modes/JavaScriptTokenMaker.flex | 4 +-
.../modes/JavaScriptTokenMaker.java | 8 +-
.../ui/rsyntaxtextarea/modes/JavaTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/JavaTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/JsonTokenMaker.flex | 7 +-
.../ui/rsyntaxtextarea/modes/JsonTokenMaker.java | 13 +-
.../ui/rsyntaxtextarea/modes/LatexTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/LatexTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/LispTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/LispTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/LuaTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/LuaTokenMaker.java | 7 +-
.../rsyntaxtextarea/modes/MakefileTokenMaker.flex | 10 +-
.../rsyntaxtextarea/modes/MakefileTokenMaker.java | 36 +-
.../ui/rsyntaxtextarea/modes/MxmlTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/MxmlTokenMaker.java | 8 +-
.../ui/rsyntaxtextarea/modes/NSISTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/NSISTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/PHPTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/PHPTokenMaker.java | 8 +-
.../ui/rsyntaxtextarea/modes/PerlTokenMaker.flex | 12 +-
.../ui/rsyntaxtextarea/modes/PerlTokenMaker.java | 16 +-
.../rsyntaxtextarea/modes/PlainTextTokenMaker.flex | 3 +-
.../rsyntaxtextarea/modes/PlainTextTokenMaker.java | 8 +-
.../modes/PropertiesFileTokenMaker.flex | 4 +-
.../modes/PropertiesFileTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/PythonTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/PythonTokenMaker.java | 8 +-
.../ui/rsyntaxtextarea/modes/RubyTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/RubyTokenMaker.java | 8 +-
.../ui/rsyntaxtextarea/modes/SASTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/SASTokenMaker.java | 8 +-
.../ui/rsyntaxtextarea/modes/SQLTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/SQLTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/ScalaTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/ScalaTokenMaker.java | 7 +-
.../ui/rsyntaxtextarea/modes/TclTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/TclTokenMaker.java | 7 +-
.../rsyntaxtextarea/modes/UnixShellTokenMaker.java | 4 +
.../modes/VisualBasicTokenMaker.flex | 4 +-
.../modes/VisualBasicTokenMaker.java | 7 +-
.../modes/WindowsBatchTokenMaker.java | 4 +
.../ui/rsyntaxtextarea/modes/XMLTokenMaker.flex | 4 +-
.../ui/rsyntaxtextarea/modes/XMLTokenMaker.java | 9 +-
.../rsyntaxtextarea/parser/DefaultParseResult.java | 6 +-
.../parser/DefaultParserNotice.java | 21 +-
.../ui/rsyntaxtextarea/parser/ParseResult.java | 2 +-
.../ui/rsyntaxtextarea/parser/ParserNotice.java | 2 +-
.../ui/rsyntaxtextarea/parser/TaskTagParser.java | 2 +-
.../fife/ui/rsyntaxtextarea/parser/XmlParser.java | 19 +-
.../templates/AbstractCodeTemplate.java | 16 +-
.../ui/rsyntaxtextarea/templates/CodeTemplate.java | 3 +-
.../templates/StaticCodeTemplate.java | 5 +-
.../BufferedImageBackgroundPainterStrategy.java | 2 +
.../ui/rtextarea/ChangeableHighlightPainter.java | 1 +
.../rtextarea/ColorBackgroundPainterStrategy.java | 2 +
src/org/fife/ui/rtextarea/ConfigurableCaret.java | 36 +-
src/org/fife/ui/rtextarea/FoldIndicator.java | 13 +-
src/org/fife/ui/rtextarea/Gutter.java | 4 +
src/org/fife/ui/rtextarea/IconGroup.java | 2 +
src/org/fife/ui/rtextarea/IconRowHeader.java | 37 +-
.../fife/ui/rtextarea/LineHighlightManager.java | 17 +-
src/org/fife/ui/rtextarea/LineNumberList.java | 10 +-
src/org/fife/ui/rtextarea/Macro.java | 91 +-
.../fife/ui/rtextarea/RDocumentCharSequence.java | 1 +
.../fife/ui/rtextarea/RTATextTransferHandler.java | 9 +-
src/org/fife/ui/rtextarea/RTextArea.java | 56 +-
src/org/fife/ui/rtextarea/RTextAreaBase.java | 13 +-
src/org/fife/ui/rtextarea/RTextAreaEditorKit.java | 111 +-
src/org/fife/ui/rtextarea/RTextAreaUI.java | 12 +-
src/org/fife/ui/rtextarea/RTextScrollPane.java | 1 +
src/org/fife/ui/rtextarea/RUndoManager.java | 7 +
.../fife/ui/rtextarea/RecordableTextAction.java | 6 +-
src/org/fife/ui/rtextarea/SearchEngine.java | 5 +-
.../VolatileImageBackgroundPainterStrategy.java | 2 +
test/org/fife/ui/rtextarea/SearchEngineTest.java | 3 +-
themes/idea.xml | 2 +-
172 files changed, 5827 insertions(+), 3197 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rsyntaxtextarea.git
More information about the pkg-java-commits
mailing list