aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes/python.el
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina2012-05-17 00:03:10 -0300
committerFabián Ezequiel Gallina2012-05-17 00:03:10 -0300
commitf9471190dcdeb216c76771bea4483989291b1bbd (patch)
treeace06d0a0c1944e8aac8f44febae42b54869161f /lisp/progmodes/python.el
parent86f1889aa95d179c6d46fbb138eb47578c9aa372 (diff)
downloademacs-f9471190dcdeb216c76771bea4483989291b1bbd.tar.gz
emacs-f9471190dcdeb216c76771bea4483989291b1bbd.zip
Better indentation handling when inside parens.
Diffstat (limited to 'lisp/progmodes/python.el')
-rw-r--r--lisp/progmodes/python.el6
1 files changed, 3 insertions, 3 deletions
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."
670 ('inside-paren 670 ('inside-paren
671 (or (save-excursion 671 (or (save-excursion
672 (forward-comment 1) 672 (forward-comment 1)
673 (looking-at (regexp-opt '(")" "]" "}"))) 673 (when (and (looking-at (regexp-opt '(")" "]" "}")))
674 (forward-char 1) 674 (not (forward-char 1))
675 (when (not (python-info-ppss-context 'paren)) 675 (not (python-info-ppss-context 'paren)))
676 (goto-char context-start) 676 (goto-char context-start)
677 (back-to-indentation) 677 (back-to-indentation)
678 (current-column))) 678 (current-column)))