Turn -fprint-bind-result off by default

3 files changed, 23 insertions, 30 deletions

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 3ef66cb099..2603c85808 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -524,27 +524,25 @@ defaultDynFlags =
         pkgDatabase             = Nothing,
         pkgState                = panic "no package state yet: call GHC.setSessionDynFlags",
   haddockOptions = Nothing,
-	flags = [ 
-    	    Opt_ReadUserPackageConf,
-    
-	    Opt_MonoPatBinds, 	-- Experimentally, I'm making this non-standard
-				-- behaviour the default, to see if anyone notices
-				-- SLPJ July 06
+        flags = [
+            Opt_ReadUserPackageConf,
 
-    	    Opt_ImplicitPrelude,
-    	    Opt_MonomorphismRestriction,
+            Opt_MonoPatBinds,   -- Experimentally, I'm making this non-standard
+                                -- behaviour the default, to see if anyone notices
+                                -- SLPJ July 06
+
+            Opt_ImplicitPrelude,
+            Opt_MonomorphismRestriction,
+
+            Opt_DoAsmMangling,
 
-    	    Opt_DoAsmMangling,
-    
             Opt_GenManifest,
-            Opt_EmbedManifest,
-
-	    -- on by default:
-	    Opt_PrintBindResult ]
-	    ++ [f | (ns,f) <- optLevelFlags, 0 `elem` ns]
-	    	    -- The default -O0 options
-	    ++ standardWarnings,
-               
+            Opt_EmbedManifest
+            ]
+            ++ [f | (ns,f) <- optLevelFlags, 0 `elem` ns]
+                    -- The default -O0 options
+            ++ standardWarnings,
+
         log_action = \severity srcSpan style msg -> 
                         case severity of
                           SevInfo  -> hPutStrLn stderr (show (msg style))
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 76d98299ff..4a900b6f7d 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -517,10 +517,10 @@
 	      <entry><option>-fno-print-evld-with-show</option></entry>
 	    </row>	    
 	    <row>
-	      <entry><option>-fno-print-bind-result</option></entry>
-	      <entry><link linkend="ghci-stmts">Turn off printing of binding results in GHCi</link></entry>
+	      <entry><option>-fprint-bind-result</option></entry>
+	      <entry><link linkend="ghci-stmts">Turn on printing of binding results in GHCi</link></entry>
 	      <entry>dynamic</entry>
-	      <entry>-</entry>
+	      <entry><option>-fno-print-bind-result</option></entry>
 	    </row>
 	  </tbody>
 	</tgroup>
diff --git a/docs/users_guide/ghci.xml b/docs/users_guide/ghci.xml
index b092953b36..bac55ed431 100644
--- a/docs/users_guide/ghci.xml
+++ b/docs/users_guide/ghci.xml
@@ -368,7 +368,6 @@ hello
       <literal>IO</literal> monad.
 <screen>
 Prelude> x &lt;- return 42
-42
 Prelude> print x
 42
 Prelude>
@@ -380,7 +379,8 @@ Prelude>
       <literal>x</literal> in future statements, for example to print
       it as we did above.</para>
 
-      <para>GHCi will print the result of a statement if and only if: 
+      <para>If <option>-fprint-bind-result</option> is set then
+      GHCi will print the result of a statement if and only if: 
 	<itemizedlist>
 	  <listitem>
 	    <para>The statement is not a binding, or it is a monadic binding 
@@ -393,13 +393,8 @@ Prelude>
 	      <literal>Show</literal></para>
 	  </listitem>
 	</itemizedlist>
-      The automatic printing of binding results can be suppressed with
-      <option>:set -fno-print-bind-result</option> (this does not
-      suppress printing the result of non-binding statements).
-      <indexterm><primary><option>-fno-print-bind-result</option></primary></indexterm><indexterm><primary><option>-fprint-bind-result</option></primary></indexterm>.
-      You might want to do this to prevent the result of binding
-      statements from being fully evaluated by the act of printing
-      them, for example.</para>
+      <indexterm><primary><option>-fprint-bind-result</option></primary></indexterm><indexterm><primary><option>-fno-print-bind-result</option></primary></indexterm>.
+      </para>
 
       <para>Of course, you can also bind normal non-IO expressions
       using the <literal>let</literal>-statement:</para>