diff options
| author | Glenn Morris | 2013-01-24 20:41:39 -0800 |
|---|---|---|
| committer | Glenn Morris | 2013-01-24 20:41:39 -0800 |
| commit | 830e46e61ba1316e771c72a15e709d3d12e150b7 (patch) | |
| tree | c88c21c32f65dc77d8f76c315a41a519a585dc8f /lisp/progmodes/python.el | |
| parent | 3d4147bae3f03502acb3d12a5c9747129cc0c6aa (diff) | |
| parent | 345f866e048bdc11bc38d894a7eaaa47335443e2 (diff) | |
| download | emacs-830e46e61ba1316e771c72a15e709d3d12e150b7.tar.gz emacs-830e46e61ba1316e771c72a15e709d3d12e150b7.zip | |
Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 0e5f4c82090..2f353feb323 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -155,7 +155,10 @@ | |||
| 155 | ;; dabbrev. If you have `dabbrev-mode' activated and | 155 | ;; dabbrev. If you have `dabbrev-mode' activated and |
| 156 | ;; `python-skeleton-autoinsert' is set to t, then whenever you type | 156 | ;; `python-skeleton-autoinsert' is set to t, then whenever you type |
| 157 | ;; the name of any of those defined and hit SPC, they will be | 157 | ;; the name of any of those defined and hit SPC, they will be |
| 158 | ;; automatically expanded. | 158 | ;; automatically expanded. As an alternative you can use the defined |
| 159 | ;; skeleton commands: `python-skeleton-class', `python-skeleton-def' | ||
| 160 | ;; `python-skeleton-for', `python-skeleton-if', `python-skeleton-try' | ||
| 161 | ;; and `python-skeleton-while'. | ||
| 159 | 162 | ||
| 160 | ;; FFAP: You can find the filename for a given module when using ffap | 163 | ;; FFAP: You can find the filename for a given module when using ffap |
| 161 | ;; out of the box. This feature needs an inferior python shell | 164 | ;; out of the box. This feature needs an inferior python shell |