Mercurial > emacs
comparison lisp/progmodes/python.el @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 21 Mar 2007 13:33:07 +0000 |
| parents | 91bf6e05918b 6e293ce14a97 |
| children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
| 90788:a12805fdabe8 | 90789:c0409ee15cee |
|---|---|
| 1148 May be `python-python-command' or `python-jython-command', possibly | 1148 May be `python-python-command' or `python-jython-command', possibly |
| 1149 modified by the user. Additional arguments are added when the command | 1149 modified by the user. Additional arguments are added when the command |
| 1150 is used by `run-python' et al.") | 1150 is used by `run-python' et al.") |
| 1151 | 1151 |
| 1152 (defvar python-buffer nil | 1152 (defvar python-buffer nil |
| 1153 "*The current python process buffer. | 1153 "*The current Python process buffer. |
| 1154 | 1154 |
| 1155 Commands that send text from source buffers to Python processes have | 1155 Commands that send text from source buffers to Python processes have |
| 1156 to choose a process to send to. This is determined by buffer-local | 1156 to choose a process to send to. This is determined by buffer-local |
| 1157 value of `python-buffer'. If its value in the current buffer, | 1157 value of `python-buffer'. If its value in the current buffer, |
| 1158 i.e. both any local value and the default one, is nil, `run-python' | 1158 i.e. both any local value and the default one, is nil, `run-python' |
| 2086 ":" \n | 2086 ":" \n |
| 2087 "\"\"\"" @ " \"\"\"" \n | 2087 "\"\"\"" @ " \"\"\"" \n |
| 2088 > _ \n) | 2088 > _ \n) |
| 2089 | 2089 |
| 2090 (defvar python-default-template "if" | 2090 (defvar python-default-template "if" |
| 2091 "Default template to expand by `python-insert-template'. | 2091 "Default template to expand by `python-expand-template'. |
| 2092 Updated on each expansion.") | 2092 Updated on each expansion.") |
| 2093 | 2093 |
| 2094 (defun python-expand-template (name) | 2094 (defun python-expand-template (name) |
| 2095 "Expand template named NAME. | 2095 "Expand template named NAME. |
| 2096 Interactively, prompt for the name with completion." | 2096 Interactively, prompt for the name with completion." |