diff options
| author | Glenn Morris | 2010-11-09 23:46:01 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-11-09 23:46:01 -0800 |
| commit | bc1d5cdfd4b64f4a86d71db01b951af33cd41bcb (patch) | |
| tree | dd743eda74318748fa5d59bbbbf72c1d2d6e8a48 | |
| parent | c790cad46de1bd03f650eb25b77378203a4426eb (diff) | |
| download | emacs-bc1d5cdfd4b64f4a86d71db01b951af33cd41bcb.tar.gz emacs-bc1d5cdfd4b64f4a86d71db01b951af33cd41bcb.zip | |
* lisp/progmodes/python.el (python-shell): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 3 |
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 @@ | |||
| 1 | 2010-11-10 Glenn Morris <rgm@gnu.org> | 1 | 2010-11-10 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * progmodes/python.el (python-shell): Doc fix. | ||
| 4 | |||
| 3 | * wid-edit.el (widget-field-use-before-change) | 5 | * wid-edit.el (widget-field-use-before-change) |
| 4 | (widget-use-overlay-change): Doc fixes. | 6 | (widget-use-overlay-change): Doc fixes. |
| 5 | 7 | ||
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 | |||
| 2758 | process is started. If you use this, you will probably want to ensure | 2758 | process is started. If you use this, you will probably want to ensure |
| 2759 | that the current arguments are retained (they will be included in the | 2759 | that the current arguments are retained (they will be included in the |
| 2760 | prompt). This argument is ignored when this function is called | 2760 | prompt). This argument is ignored when this function is called |
| 2761 | programmatically, or when running in Emacs 19.34 or older. | 2761 | programmatically. |
| 2762 | 2762 | ||
| 2763 | Note: You can toggle between using the CPython interpreter and the | 2763 | Note: You can toggle between using the CPython interpreter and the |
| 2764 | JPython interpreter by hitting \\[python-toggle-shells]. This toggles | 2764 | JPython interpreter by hitting \\[python-toggle-shells]. This toggles |
| @@ -2835,5 +2835,4 @@ filter." | |||
| 2835 | (provide 'python) | 2835 | (provide 'python) |
| 2836 | (provide 'python-21) | 2836 | (provide 'python-21) |
| 2837 | 2837 | ||
| 2838 | ;; arch-tag: 6fce1d99-a704-4de9-ba19-c6e4912b0554 | ||
| 2839 | ;;; python.el ends here | 2838 | ;;; python.el ends here |