diff options
| author | Rasmus | 2014-11-29 13:37:13 +0100 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2014-11-29 13:58:20 -0300 |
| commit | bb19b229f9c1c32ed8829f14f670bfd9d7ebe2a2 (patch) | |
| tree | f80a203da601409be57881a486420956bbc45484 /lisp/progmodes/python.el | |
| parent | 6b765b8facbdbb03f28028007885236601652515 (diff) | |
| download | emacs-bb19b229f9c1c32ed8829f14f670bfd9d7ebe2a2.tar.gz emacs-bb19b229f9c1c32ed8829f14f670bfd9d7ebe2a2.zip | |
Python.el: Update commentary on RET-behavior
Commentary reflect that `electric-indent-mode' in enabled by default.
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 48d80b99c6a..521f0b5be19 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -209,11 +209,13 @@ | |||
| 209 | ;; `python-imenu-format-parent-item-jump-label-function' variables for | 209 | ;; `python-imenu-format-parent-item-jump-label-function' variables for |
| 210 | ;; changing the way labels are formatted in the tree version. | 210 | ;; changing the way labels are formatted in the tree version. |
| 211 | 211 | ||
| 212 | ;; If you used python-mode.el you probably will miss auto-indentation | 212 | ;; If you used python-mode.el you may miss auto-indentation when |
| 213 | ;; when inserting newlines. To achieve the same behavior you have | 213 | ;; inserting newlines. To achieve the same behavior you have two |
| 214 | ;; two options: | 214 | ;; options: |
| 215 | 215 | ||
| 216 | ;; 1) Use GNU/Emacs' standard binding for `newline-and-indent': C-j. | 216 | ;; 1) Enable the minor-mode `electric-indent-mode' (enabled by |
| 217 | ;; default) and use RET. If this mode is disabled use | ||
| 218 | ;; `newline-and-indent', bound to C-j. | ||
| 217 | 219 | ||
| 218 | ;; 2) Add the following hook in your .emacs: | 220 | ;; 2) Add the following hook in your .emacs: |
| 219 | 221 | ||