From e0acfb7254f97f623286e65483535c1b6312f4ba Mon Sep 17 00:00:00 2001 From: Tommi Komulainen Date: Fri, 19 Jun 2015 18:53:52 +0200 Subject: [PATCH 1/2] python.el: Fix close paren indentation to match pep8 (Bug#20742) * lisp/progmodes/python.el (python-indent--calculate-indentation): When opening paren is followed by newline the closing paren should follow the current indentation. Otherwise the closing paren should be aligned with the opening paren. This fixes the latter case. Copyright-paperwork-exempt: yes --- lisp/progmodes/python.el | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index eb3e31c4b7..188bc973d9 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1070,12 +1070,18 @@ (defun python-indent--calculate-indentation () (`(,(or :after-line :after-comment :inside-string - :after-backslash - :inside-paren-at-closing-paren - :inside-paren-at-closing-nested-paren) . ,start) + :after-backslash) . ,start) ;; Copy previous indentation. (goto-char start) (current-indentation)) + (`(,(or :inside-paren-at-closing-paren + :inside-paren-at-closing-nested-paren) . ,start) + (goto-char (+ 1 start)) + (if (looking-at "[ \t]*\\(?:#\\|$\\)") + ;; Copy previous indentation. + (current-indentation) + ;; Align with opening paren. + (current-column))) (`(:inside-docstring . ,start) (let* ((line-indentation (current-indentation)) (base-indent (progn -- 2.11.0