bug#19216: 25.0.50; python.el: Update commentary on RET

bug#19216: 25.0.50; python.el: Update commentary on RET

[Rasmus]

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

Hi,

Now that `electric-indent-mode' is enabled by default I think we can
update the commentary of RET behavior in python.el.  I guess this
doesn't require a changelog entry?

—Rasmus

-- 
Governments should be afraid of their people

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-Python.el-Update-commentary-on-RET-behavior.patch --]
[-- Type: text/x-diff, Size: 1278 bytes --]

From 2df0e09686f682fd2edd5c8ff9ec46244fdfad8f Mon Sep 17 00:00:00 2001
From: Rasmus <rasmus@gmx.us>
Date: Sat, 29 Nov 2014 13:37:13 +0100
Subject: [PATCH] Python.el: Update commentary on RET-behavior

Commentary reflect that `electric-indent-mode' in enabled by default.
---
 lisp/progmodes/python.el | 10 ++++++----
 1 file 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:

--
2.1.3

bug#19216: python.el: Update commentary on RET

[Fabián Ezequiel Gallina]

Pushed at bb19b22 in the emacs-24 branch.


Thanks for the patch,
Fabián