bug#28475: 25.3; python double-indents multi-line function argument blocks

[Ross Donaldson <gastove@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 1049 bytes --]

Ahhh, I see. Well! This patch didn't need to touch either function, so!

Here we are.

On Sun, Sep 24, 2017 at 9:42 AM Noam Postavsky <
npostavs@users.sourceforge.net> wrote:

> Ross Donaldson <gastove@gmail.com> writes:
>
> > I was thrown off by the `prog-FOO` commands because of this message
> > in the ChangeLog:
> >
> > ```
> > 2016-03-27  Dmitry Gutov  <dgutov@yandex.ru>
> >
> > Remove prog-indentation-context
> >
> > * lisp/progmodes/prog-mode.el: (prog-indentation-context)
> > (prog-first-column, prog-widen): Remove, as discussed in
> > http://lists.gnu.org/archive/html/emacs-devel/2016-03/msg01425.html.
> > ```
>
> Oh, that is a bit confusing, but now I see what happened: it was indeed
> removed for Emacs-25, but is still present in Emacs-26 and later.  If
> you look to the end of that message you will see
>
>         Do not merge to master.
>
> Which gives the hint.
>
>
> > I haven't assigned copyright to Emacs yet; I'd be happy to, and also,
> > I suspect this patch will be quite short. I'll send it over soon.
>
> Thanks!
>

[-- Attachment #1.2: Type: text/html, Size: 1718 bytes --]

[-- Attachment #2: scale-by-const.patch --]
[-- Type: application/octet-stream, Size: 1975 bytes --]

From 83a622ec32a64ae30e68de18a84cc32fc6a811d9 Mon Sep 17 00:00:00 2001
From: Ross Donaldson <gastove@gmail.com>
Date: Sun, 24 Sep 2017 09:42:23 -0700
Subject: [PATCH] Rather than scaling certain python blocks by a constant,
 scale by a defcustom

This provides customization of the number of indent levels in
multi-line `def` blocks in python; it also corrects a nearby (but
unrelated) incorrect symbol quote.
---
 lisp/progmodes/python.el | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index f3513ced4b..3181353d20 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -738,7 +738,7 @@ It makes underscores and dots word constituent chars.")
   :version "25.1"
   :type 'boolean
   :group 'python
-  :safe' booleanp)
+  :safe 'booleanp)
 
 (defcustom python-indent-trigger-commands
   '(indent-for-tab-command yas-expand yas/expand)
@@ -746,6 +746,12 @@ It makes underscores and dots word constituent chars.")
   :type '(repeat symbol)
   :group 'python)
 
+(defcustom python-indent-def-block-scale 2
+  "Multiplier applied to indentation inside multi-line def blocks."
+  :version "26.0"
+  :type 'integer
+  :safe (lambda (i) (and (integerp i) (< 0 i))))
+
 (define-obsolete-variable-alias
   'python-indent 'python-indent-offset "24.3")
 
@@ -1075,9 +1081,8 @@ possibilities can be narrowed to specific indentation points."
                          (current-indentation)))
                      opening-block-start-points))))
         (`(,(or :inside-paren-newline-start-from-block) . ,start)
-         ;; Add two indentation levels to make the suite stand out.
          (goto-char start)
-         (+ (current-indentation) (* python-indent-offset 2)))))))
+         (+ (current-indentation) (* python-indent-offset python-indent-def-block-scale)))))))
 
 (defun python-indent--calculate-levels (indentation)
   "Calculate levels list given INDENTATION.
-- 
2.14.1