diff options
| author | Stefan Monnier | 2010-11-17 22:54:14 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-11-17 22:54:14 -0500 |
| commit | 4a47c2757309e338321da1e7a2f6d399a306ce7d (patch) | |
| tree | de441bac2c90c3302459c5f0ffe9c53ec4b31c2f /lisp/progmodes/python.el | |
| parent | 8bbb7dd8a6d08540a81a7a2baa2274d8e6d65c92 (diff) | |
| parent | b916cbefa481920a49eac03c7025693f38afc882 (diff) | |
| download | emacs-4a47c2757309e338321da1e7a2f6d399a306ce7d.tar.gz emacs-4a47c2757309e338321da1e7a2f6d399a306ce7d.zip | |
Merge from emacs-23
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index a19445f47f5..7754dc6c87c 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -2807,7 +2807,7 @@ command is used to switch to an existing process, only when a new | |||
| 2807 | process is started. If you use this, you will probably want to ensure | 2807 | process is started. If you use this, you will probably want to ensure |
| 2808 | that the current arguments are retained (they will be included in the | 2808 | that the current arguments are retained (they will be included in the |
| 2809 | prompt). This argument is ignored when this function is called | 2809 | prompt). This argument is ignored when this function is called |
| 2810 | programmatically, or when running in Emacs 19.34 or older. | 2810 | programmatically. |
| 2811 | 2811 | ||
| 2812 | Note: You can toggle between using the CPython interpreter and the | 2812 | Note: You can toggle between using the CPython interpreter and the |
| 2813 | JPython interpreter by hitting \\[python-toggle-shells]. This toggles | 2813 | JPython interpreter by hitting \\[python-toggle-shells]. This toggles |