[Emacs-diffs] master 0bb24df 1/5: Merge from origin/emacs-24

[Stefan Monnier]

branch: master
commit 0bb24df135e9c44d2e5a78b58b10719eea9e413b
Merge: be30748 bb19b22
Author: Stefan Monnier <address@hidden>
Commit: Stefan Monnier <address@hidden>

    Merge from origin/emacs-24
    
    bb19b22 Python.el: Update commentary on RET-behavior
---
 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 b99e195..9f9db6c 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -217,11 +217,13 @@
 ;; `python-imenu-format-parent-item-jump-label-function' variables for
 ;; changing the way labels are formatted in the tree version.
 
-;; If you used python-mode.el you probably will miss auto-indentation
-;; when inserting newlines.  To achieve the same behavior you have
-;; two options:
+;; If you used python-mode.el you may miss auto-indentation when
+;; inserting newlines.  To achieve the same behavior you have two
+;; options:
 
-;; 1) Use GNU/Emacs' standard binding for `newline-and-indent': C-j.
+;; 1) Enable the minor-mode `electric-indent-mode' (enabled by
+;;    default) and use RET.  If this mode is disabled use
+;;    `newline-and-indent', bound to C-j.
 
 ;; 2) Add the following hook in your .emacs: