diff options
| author | Fabián Ezequiel Gallina | 2012-05-17 00:03:29 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2012-05-17 00:03:29 -0300 |
| commit | 9399498ea73905a1b6c35ad2238119534a90769f (patch) | |
| tree | b7f51404992972754b31c9bbf8f1d8c64087d0f2 /lisp/progmodes/python.el | |
| parent | 2bdce3883b7a3014aea3ae3a9decf77ecee8dd40 (diff) | |
| download | emacs-9399498ea73905a1b6c35ad2238119534a90769f.tar.gz emacs-9399498ea73905a1b6c35ad2238119534a90769f.zip | |
Documentation enhancements
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index f5b75686f50..73b4776f7ab 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -77,9 +77,12 @@ | |||
| 77 | ;; python-shell-interpreter-args "" | 77 | ;; python-shell-interpreter-args "" |
| 78 | ;; python-shell-prompt-regexp "In \\[[0-9]+\\]: " | 78 | ;; python-shell-prompt-regexp "In \\[[0-9]+\\]: " |
| 79 | ;; python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: " | 79 | ;; python-shell-prompt-output-regexp "Out\\[[0-9]+\\]: " |
| 80 | ;; python-shell-completion-setup-code "" | 80 | ;; python-shell-completion-setup-code |
| 81 | ;; "from IPython.core.completerlib import module_completion" | ||
| 82 | ;; python-shell-module-completion-string-code | ||
| 83 | ;; "';'.join(module_completion('''%s'''))\n" | ||
| 81 | ;; python-shell-completion-string-code | 84 | ;; python-shell-completion-string-code |
| 82 | ;; "';'.join(get_ipython().Completer.all_completions('''%s'''))\n") | 85 | ;; "';'.join(get_ipython().Completer.all_completions('''%s'''))\n") |
| 83 | 86 | ||
| 84 | ;; For iPython 0.10 everything would be the same except for | 87 | ;; For iPython 0.10 everything would be the same except for |
| 85 | ;; `python-shell-completion-string-code': | 88 | ;; `python-shell-completion-string-code': |
| @@ -1292,10 +1295,11 @@ controls which Python interpreter is run. Variables | |||
| 1292 | `python-shell-prompt-output-regexp', | 1295 | `python-shell-prompt-output-regexp', |
| 1293 | `python-shell-prompt-block-regexp', | 1296 | `python-shell-prompt-block-regexp', |
| 1294 | `python-shell-completion-setup-code', | 1297 | `python-shell-completion-setup-code', |
| 1295 | `python-shell-completion-string-code', `python-eldoc-setup-code', | 1298 | `python-shell-completion-string-code', |
| 1296 | `python-eldoc-string-code', `python-ffap-setup-code' and | 1299 | `python-shell-module-completion-string-code', |
| 1297 | `python-ffap-string-code' can customize this mode for different | 1300 | `python-eldoc-setup-code', `python-eldoc-string-code', |
| 1298 | Python interpreters. | 1301 | `python-ffap-setup-code' and `python-ffap-string-code' can |
| 1302 | customize this mode for different Python interpreters. | ||
| 1299 | 1303 | ||
| 1300 | You can also add additional setup code to be run at | 1304 | You can also add additional setup code to be run at |
| 1301 | initialization of the interpreter via `python-shell-setup-codes' | 1305 | initialization of the interpreter via `python-shell-setup-codes' |