Merge pull request ethereum#3231 from fjl/liner-update

console, vendor: update liner and enable multiline mode
luren5 · Nov 7, 2016 · e0e18f3 · e0e18f3
2 parents 15c8d46 + 0b8a14f
commit e0e18f3
Show file tree

Hide file tree

Showing 9 changed files with 132 additions and 79 deletions.
diff --git a/console/prompter.go b/console/prompter.go
@@ -95,7 +95,7 @@ func newTerminalPrompter() *terminalPrompter {
 	}
 	p.SetCtrlCAborts(true)
 	p.SetTabCompletionStyle(liner.TabPrints)
-
+	p.SetMultiLineMode(true)
 	return p
 }
 

diff --git a/vendor.conf b/vendor.conf
@@ -18,7 +18,7 @@ github.com/mattn/go-runewidth	v0.0.1-10-g737072b
 github.com/mitchellh/go-wordwrap	ad45545
 github.com/nsf/termbox-go	b6acae5
 github.com/pborman/uuid	v1.0-17-g3d4f2ba
-github.com/peterh/liner	8975875
+github.com/peterh/liner	3c5f577
 github.com/rcrowley/go-metrics	ab2277b
 github.com/rjeczalik/notify	7e20c15
 github.com/robertkrimen/otto	bf1c379

diff --git a/vendor/github.com/peterh/liner/common.go b/vendor/github.com/peterh/liner/common.go
diff --git a/vendor/github.com/peterh/liner/input.go b/vendor/github.com/peterh/liner/input.go
diff --git a/vendor/github.com/peterh/liner/input_windows.go b/vendor/github.com/peterh/liner/input_windows.go