Merge tag 'upstream/1.3.10'

Conflicts:
	VERSION

3 files changed, 9 insertions, 3 deletions

diff --git a/VERSION b/VERSION
index e05cb33..0c00f61 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.8
+1.3.10
diff --git a/qrouter.tcl.in b/qrouter.tcl.in
index 26f1960..6c553ee 100644
--- a/qrouter.tcl.in
+++ b/qrouter.tcl.in
@@ -89,13 +89,16 @@ proc qrouter::write_congested {filename} {
 # Upon first success, write the DEF file output and quit.
 # If "stage2 mask none" leaves failing routes, then write
 # the routes done so far to the DEF file output and remain
-# in the interpreter.
+# in the interpreter.  If "stage2 mask none" leaves fewer
+# than five routes (a very ad hoc number), give it a
+# second try.
 #---------------------------------------------------------
 
 proc qrouter::standard_route {} {
    if {![stage1]} {write_def; quit}
    if {![stage2]} {write_def; quit}
    set result [stage2 mask none]
+   if {$result < 5} {set result [stage2 mask none]}
    write_def
    if {$result == 0} {quit}
 }
@@ -113,7 +116,8 @@ proc qrouter::standard_route {} {
 
 proc qrouter::congestion_route {filename} {
    if {![stage1]} {write_def; quit}
-   set result [stage2]
+   set result [stage2 mask none]
+   if {$result < 5} {set result [stage2 mask none]}
    if {$result != 0} {
       qrouter::write_congested $filename
    }
diff --git a/tkcon.tcl b/tkcon.tcl
index 2747244..4b17935 100755
--- a/tkcon.tcl
+++ b/tkcon.tcl
@@ -4184,6 +4184,8 @@ proc ::tkcon::Bindings {} {
     foreach ev [bind Text] { bind TkConsole $ev [bind Text $ev] }	
     ## We really didn't want the newline insertion
     bind TkConsole <Control-Key-o> {}
+    bind TkConsole <<NextLine>> {}
+    bind TkConsole <<PrevLine>> {}
 
     ## Now make all our virtual event bindings
     foreach {ev key} [subst -nocommand -noback {