3 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
index c54b401f3f..b7235a4d4a 100644
--- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
@@ -1228,7 +1228,7 @@ object IMain {
     def maxStringLength: Int
     def isTruncating: Boolean
     def truncate(str: String): String = {
-      if (isTruncating && str.length > maxStringLength)
+      if (isTruncating && (maxStringLength != 0 && str.length > maxStringLength))
         (str take maxStringLength - 3) + "..."
       else str
     }
diff --git a/src/compiler/scala/tools/nsc/interpreter/ISettings.scala b/src/compiler/scala/tools/nsc/interpreter/ISettings.scala
index 59c933632b..d68a2becfb 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ISettings.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ISettings.scala
@@ -24,7 +24,7 @@ class ISettings(intp: IMain) {
    *  more than this number of characters, then the printout is
    *  truncated.
    */
-  var maxPrintString = 800
+  var maxPrintString = replProps.maxPrintString.option.getOrElse(800)
 
   /** The maximum number of completion candidates to print for tab
    *  completion without requiring confirmation.
diff --git a/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala b/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala
index aa58a8b2ba..218e02193a 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ReplProps.scala
@@ -7,9 +7,11 @@ package scala.tools.nsc
 package interpreter
 
 import scala.sys._
+import Prop._
 
 class ReplProps {
   private def bool(name: String) = BooleanProp.keyExists(name)
+  private def int(name: String) = IntProp(name)
 
   val jlineDebug = bool("scala.tools.jline.internal.Log.debug")
   val jlineTrace = bool("scala.tools.jline.internal.Log.trace")
@@ -25,4 +27,5 @@ class ReplProps {
   val powerBanner     = Prop[JFile]("scala.repl.power.banner")
 
   val vids = bool("scala.repl.vids")
+  val maxPrintString = int("scala.repl.maxprintstring")
 }