From: Fabián Ezequiel Gallina <fgallina@cuca>
Date: Thu, 17 May 2012 03:03:10 +0000 (-0300)
Subject: Better indentation handling when inside parens.
X-Git-Tag: emacs-24.2.90~1199^2~579
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f9471190dcdeb216c76771bea4483989291b1bbd;p=emacs.git

Better indentation handling when inside parens.
---

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index b6bb825fc1a..dc9e091603b 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -670,9 +670,9 @@ START is the buffer position where the sexp starts."
           ('inside-paren
            (or (save-excursion
                  (forward-comment 1)
-                 (looking-at (regexp-opt '(")" "]" "}")))
-                 (forward-char 1)
-                 (when (not (python-info-ppss-context 'paren))
+                 (when (and (looking-at (regexp-opt '(")" "]" "}")))
+                            (not (forward-char 1))
+                            (not (python-info-ppss-context 'paren)))
                    (goto-char context-start)
                    (back-to-indentation)
                    (current-column)))