This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository jline2.
commit 51db73742545ad268ef7100d288ca078b1333d5e
Merge: f104888 642914a
Author: tony mancill <tmanc...@debian.org>
Date: Mon Jan 8 22:06:52 2018 -0800
Merge branch 'upstream' (version 2.12.1)
README.md | 2 +-
pom.xml | 13 +-
src/main/java/jline/Terminal.java | 2 +
src/main/java/jline/TerminalFactory.java | 14 +-
src/main/java/jline/TerminalSupport.java | 17 +-
src/main/java/jline/UnixTerminal.java | 4 +
src/main/java/jline/WindowsTerminal.java | 117 +++++++-
src/main/java/jline/console/ConsoleReader.java | 310 +++++++++++++++++----
src/main/java/jline/console/CursorBuffer.java | 8 +
src/main/java/jline/console/KeyMap.java | 8 +-
src/main/java/jline/console/KillRing.java | 164 +++++++++++
src/main/java/jline/console/Operation.java | 3 +
.../jline/console/completer/ArgumentCompleter.java | 91 +++++-
.../jline/console/completer/FileNameCompleter.java | 2 +-
.../java/jline/console/internal/ConsoleRunner.java | 4 +-
src/main/java/jline/internal/Configuration.java | 31 ++-
.../java/jline/internal/TerminalLineSettings.java | 34 ++-
src/site/site.xml | 2 +-
src/test/java/jline/console/ConsoleReaderTest.java | 81 ++++--
.../jline/console/ConsoleReaderTestSupport.java | 38 +--
src/test/java/jline/console/EditLineTest.java | 8 +
src/test/java/jline/console/KillRingTest.java | 171 ++++++++++++
src/test/java/jline/console/ViMoveModeTest.java | 49 ++++
.../console/completer/WhitespaceDelimiterTest.java | 82 ++++++
.../java/jline/console/history/HistoryTest.java | 61 ++++
src/test/java/jline/example/Example.java | 3 +
.../java/jline/internal/ConfigurationTest.java | 35 ++-
.../jline/internal/TerminalLineSettingsTest.java | 21 ++
28 files changed, 1225 insertions(+), 150 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jline2.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
