diff options
| author | Stefan Monnier | 2014-12-05 15:12:00 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-12-05 15:12:00 -0500 |
| commit | 0bb24df135e9c44d2e5a78b58b10719eea9e413b (patch) | |
| tree | 69f9f5c2df0eaefaa0b97dcd3df1d01a7ee28a9b | |
| parent | be307485f722be57985da979296fa37569c2a5a9 (diff) | |
| parent | bb19b229f9c1c32ed8829f14f670bfd9d7ebe2a2 (diff) | |
| download | emacs-0bb24df135e9c44d2e5a78b58b10719eea9e413b.tar.gz emacs-0bb24df135e9c44d2e5a78b58b10719eea9e413b.zip | |
Merge from origin/emacs-24
bb19b22 Python.el: Update commentary on RET-behavior
| -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 b99e195f407..9f9db6c6046 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -217,11 +217,13 @@ | |||
| 217 | ;; `python-imenu-format-parent-item-jump-label-function' variables for | 217 | ;; `python-imenu-format-parent-item-jump-label-function' variables for |
| 218 | ;; changing the way labels are formatted in the tree version. | 218 | ;; changing the way labels are formatted in the tree version. |
| 219 | 219 | ||
| 220 | ;; If you used python-mode.el you probably will miss auto-indentation | 220 | ;; If you used python-mode.el you may miss auto-indentation when |
| 221 | ;; when inserting newlines. To achieve the same behavior you have | 221 | ;; inserting newlines. To achieve the same behavior you have two |
| 222 | ;; two options: | 222 | ;; options: |
| 223 | 223 | ||
| 224 | ;; 1) Use GNU/Emacs' standard binding for `newline-and-indent': C-j. | 224 | ;; 1) Enable the minor-mode `electric-indent-mode' (enabled by |
| 225 | ;; default) and use RET. If this mode is disabled use | ||
| 226 | ;; `newline-and-indent', bound to C-j. | ||
| 225 | 227 | ||
| 226 | ;; 2) Add the following hook in your .emacs: | 228 | ;; 2) Add the following hook in your .emacs: |
| 227 | 229 | ||