aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYit Phang Khoo <khooyp@sourceware.org>2012-08-23 18:55:25 +0000
committerYit Phang Khoo <khooyp@sourceware.org>2012-08-23 18:55:25 +0000
commite3480f4aa1c96384e52740884918ad0ba6228830 (patch)
treeadedeb22cab6e4f6a005b7f90ea1b569500d6aa9
parentdfbd5e7bbbf503e8e0f3bdcb0a15ed7ee605a5f3 (diff)
downloadgdb-e3480f4aa1c96384e52740884918ad0ba6228830.zip
gdb-e3480f4aa1c96384e52740884918ad0ba6228830.tar.gz
gdb-e3480f4aa1c96384e52740884918ad0ba6228830.tar.bz2
Document how to return from "python-interactive" to GDB.
* doc/gdb.texinfo (Python Commands): Update documentation. * python/python.c (_initialize_python): Update documentation.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/doc/gdb.texinfo3
-rw-r--r--gdb/python/python.c5
3 files changed, 12 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8c304b0..93a993c 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 4410a47..534b218 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 1e59d1e..482f53e 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\