X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=docs%2Fusers_guide%2Fghci.xml;h=cd2a836de3b031d24af75b6a3c3e97f0f6ee78b8;hb=1bfdc3b39bbf5ab24ca5b24fd5fc711022b32ec7;hp=76d4972edf316e8fb1a8672346bea381a9b6e476;hpb=939ce676b146713bbe0de42dec6c30da2c948049;p=ghc-hetmet.git

diff --git a/docs/users_guide/ghci.xml b/docs/users_guide/ghci.xml
index 76d4972..cd2a836 100644
--- a/docs/users_guide/ghci.xml
+++ b/docs/users_guide/ghci.xml
@@ -49,6 +49,8 @@ Prelude>
    :browse [*]<module>         display the names defined by <module>
    :cd <dir>                   change directory to <dir>
    :def <cmd> <expr>           define a command :<cmd>
+   :edit <file>                edit file
+   :edit                       edit last module
    :help, :?                   display this list of commands
    :info [<name> ...]          display information about the given names
    :load <filename> ...        load module(s) and their dependents
@@ -60,12 +62,13 @@ Prelude>
    :set args <arg> ...         set the arguments returned by System.getArgs
    :set prog <progname>        set the value returned by System.getProgName
    :set prompt <prompt>        set the prompt used in GHCi
+   :set editor <cmd>        set the command used for :edit
 
    :show modules               show the currently loaded modules
    :show bindings              show the current bindings made at the prompt
 
    :ctags [<file>]             create tags file for Vi (default: "tags")
-   :etags [<file>]             create tags file for Emacs (defauilt: "TAGS")
+   :etags [<file>]             create tags file for Emacs (default: "TAGS")
    :type <expr>                show the type of <expr>
    :kind <type>                show the kind of <type>
    :undef <cmd>                undefine user-defined command :<cmd>
@@ -1022,7 +1025,8 @@ Prelude> :. cmds.ghci
 	  module if <replaceable>file</replaceable> is omitted.  The
 	  editor to invoke is taken from the <literal>EDITOR</literal>
 	  environment variable, or a default editor on your system if
-	  <literal>EDITOR</literal> is not set.</para>
+	  <literal>EDITOR</literal> is not set.  You can change the
+	  editor using <literal>:set editor</literal>.</para>
 	</listitem>
       </varlistentry>
 
@@ -1193,6 +1197,16 @@ Prelude> :main foo bar
 
       <varlistentry>
 	<term>
+           <literal>:set</literal> <literal>editor</literal> <replaceable>cmd</replaceable>
+        </term>
+	<listitem>
+	  <para>Sets the command used by <literal>:edit</literal> to
+	  <replaceable>cmd</replaceable>.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+	<term>
            <literal>:set</literal> <literal>prog</literal> <replaceable>prog</replaceable>
            <indexterm><primary><literal>:set prog</literal></primary></indexterm>
         </term>
@@ -1542,10 +1556,9 @@ Prelude> :set -fno-glasgow-exts
 	<term>Concurrent threads don't carry on running when GHCi is
         waiting for input.</term>
 	<listitem>
-	  <para>No, they don't.  This is because the Haskell binding
-	  to the GNU readline library doesn't support reading from the
-	  terminal in a non-blocking way, which is required to work
-	  properly with GHC's concurrency model.</para>
+	  <para>This should work, as long as your GHCi was built with
+	  the <option>-threaded</option> switch, which is the default.
+	  Consult whoever supplied your GHCi installation.</para>
 	</listitem>
       </varlistentry>