Merge from emacs-24; up to 2014-07-04T02:28:54Z!dmantipov@yandex.ru

1 files changed, 7 insertions, 1 deletions

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f12486d0acb..dc38966bcaf 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1162,9 +1162,15 @@ the line will be re-indented automatically if needed."
      ((and (eq ?: last-command-event)
            (memq ?: electric-indent-chars)
            (not current-prefix-arg)
+           ;; Trigger electric colon only at end of line
            (eolp)
+           ;; Avoid re-indenting on extra colon
            (not (equal ?: (char-before (1- (point)))))
-           (not (python-syntax-comment-or-string-p)))
+           (not (python-syntax-comment-or-string-p))
+           ;; Never re-indent at beginning of defun
+           (not (save-excursion
+                  (python-nav-beginning-of-statement)
+                  (python-info-looking-at-beginning-of-defun))))
       (python-indent-line)))))