summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-11-09 23:46:01 -0800
committerGlenn Morris <rgm@gnu.org>2010-11-09 23:46:01 -0800
commitbc1d5cdfd4b64f4a86d71db01b951af33cd41bcb (patch)
treedd743eda74318748fa5d59bbbbf72c1d2d6e8a48
parentc790cad46de1bd03f650eb25b77378203a4426eb (diff)
* lisp/progmodes/python.el (python-shell): Doc fix.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/progmodes/python.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 03e7ce86246..4e6f7f4a24c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
2010-11-10 Glenn Morris <rgm@gnu.org>
+ * progmodes/python.el (python-shell): Doc fix.
+
* wid-edit.el (widget-field-use-before-change)
(widget-use-overlay-change): Doc fixes.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index dba8fe5572b..ac0fc4f3a3b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2758,7 +2758,7 @@ command is used to switch to an existing process, only when a new
process is started. If you use this, you will probably want to ensure
that the current arguments are retained (they will be included in the
prompt). This argument is ignored when this function is called
-programmatically, or when running in Emacs 19.34 or older.
+programmatically.
Note: You can toggle between using the CPython interpreter and the
JPython interpreter by hitting \\[python-toggle-shells]. This toggles
@@ -2835,5 +2835,4 @@ filter."
(provide 'python)
(provide 'python-21)
-;; arch-tag: 6fce1d99-a704-4de9-ba19-c6e4912b0554
;;; python.el ends here