From: Rasmus <rasmus@gmx.us>
Date: Sat, 29 Nov 2014 12:37:13 +0000 (+0100)
Subject: Python.el: Update commentary on RET-behavior
X-Git-Tag: emacs-24.4.90~165
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bb19b22;p=emacs.git

Python.el: Update commentary on RET-behavior

Commentary reflect that `electric-indent-mode' in enabled by default.
---

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 @@
 ;; `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: