From: Yit Phang Khoo <khooyp@sourceware.org>
Date: Thu, 23 Aug 2012 18:55:25 +0000 (+0000)
Subject: 	Document how to return from "python-interactive" to GDB.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e3480f4aa1c96384e52740884918ad0ba6228830;p=deliverable%2Fbinutils-gdb.git

	Document how to return from "python-interactive" to GDB.
	* doc/gdb.texinfo (Python Commands): Update documentation.
	* python/python.c (_initialize_python): Update documentation.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8c304b08fb..93a993c6d2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-23  Khoo Yit Phang <khooyp@cs.umd.edu>
+
+	Document how to return from "python-interactive" to GDB.
+	* doc/gdb.texinfo (Python Commands): Update documentation.
+	* python/python.c (_initialize_python): Update documentation.
+
 2012-08-23  Pedro Alves  <palves@redhat.com>
 
 	* infrun.c (_initialize_infrun) <handle command help text>:
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 4410a4778b..534b2184cc 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -22515,7 +22515,8 @@ and one related setting:
 @item python-interactive @r{[}@var{command}@r{]}
 @itemx pi @r{[}@var{command}@r{]}
 Without an argument, the @code{python-interactive} command can be used
-to start an interactive Python prompt.
+to start an interactive Python prompt.  To return to @value{GDBN},
+type the @code{EOF} character (e.g., @kbd{Ctrl-D} on an empty prompt).
 
 Alternatively, a single-line Python command can be given as an
 argument and evaluated.  If the command is an expression, the result
diff --git a/gdb/python/python.c b/gdb/python/python.c
index 1e59d1e5d1..482f53e121 100644
--- a/gdb/python/python.c
+++ b/gdb/python/python.c
@@ -1277,7 +1277,10 @@ _initialize_python (void)
 	   python_interactive_command,
 #ifdef HAVE_PYTHON
 	   _("\
-Start a Python interactive prompt.\n\
+Start an interactive Python prompt.\n\
+\n\
+To return to GDB, type the EOF character (e.g., Ctrl-D on an empty\n\
+prompt).\n\
 \n\
 Alternatively, a single-line Python command can be given as an\n\
 argument, and if the command is an expression, the result will be\n\