From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Noam Postavsky Newsgroups: gmane.emacs.bugs Subject: bug#28475: 25.3; python double-indents multi-line function argument blocks Date: Sun, 24 Sep 2017 13:42:12 -0400 Message-ID: <87fubcm1sb.fsf@users.sourceforge.net> References: <87tvzsmgep.fsf@users.sourceforge.net> <87ing8m4kb.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1506274990 1089 195.159.176.226 (24 Sep 2017 17:43:10 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 24 Sep 2017 17:43:10 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.0.60 (gnu/linux) Cc: 28475@debbugs.gnu.org To: Ross Donaldson Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Sep 24 19:43:06 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwAvo-0008Kh-Ef for geb-bug-gnu-emacs@m.gmane.org; Sun, 24 Sep 2017 19:43:04 +0200 Original-Received: from localhost ([::1]:38916 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwAvv-0006r3-Px for geb-bug-gnu-emacs@m.gmane.org; Sun, 24 Sep 2017 13:43:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwAvp-0006qw-KX for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2017 13:43:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwAvm-0002it-Hg for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2017 13:43:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:47711) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwAvm-0002ih-DE for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2017 13:43:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dwAvl-0007L5-Rf for bug-gnu-emacs@gnu.org; Sun, 24 Sep 2017 13:43:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Noam Postavsky Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 24 Sep 2017 17:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28475 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 28475-submit@debbugs.gnu.org id=B28475.150627494228168 (code B ref 28475); Sun, 24 Sep 2017 17:43:01 +0000 Original-Received: (at 28475) by debbugs.gnu.org; 24 Sep 2017 17:42:22 +0000 Original-Received: from localhost ([127.0.0.1]:56392 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwAv8-0007KG-AT for submit@debbugs.gnu.org; Sun, 24 Sep 2017 13:42:22 -0400 Original-Received: from mail-io0-f174.google.com ([209.85.223.174]:49794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dwAv6-0007K2-ER for 28475@debbugs.gnu.org; Sun, 24 Sep 2017 13:42:20 -0400 Original-Received: by mail-io0-f174.google.com with SMTP id 21so8009839iof.6 for <28475@debbugs.gnu.org>; Sun, 24 Sep 2017 10:42:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=7qoCyr7t49vyiQTvkjRgqmgp1xaVl0IfXxedl010KJE=; b=emyapYFSG/EBikYTGuCRXvFbs58tIx0mjX62xqNf5DLD5+BoZRsEKEXGJNIm8PhY0/ d0SZcjITIr3ZkaXmwcOGPLkZD6fZcVWCwycVakwF3m2H1ufOSgqbbVmcy0TuWFSfr8hh yXh03tlYgosI/5aObfUjk/s7qTcwbEnLOikgaMol+2uK7Q2sp8dHyysi6l5NJjIGVppU sNtJFzW4qerZlWS0UxwqA3rU3/+yJBGM5UlXy+eejOrFcU/pfXj6M8D/SxVBoBBJ0PaN fie1uhw2xulE33fQeLaYdSkOAIWEST6p8BENYuFel+O1kkwituGdDb9Y5iqYnhPh433R VYZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=7qoCyr7t49vyiQTvkjRgqmgp1xaVl0IfXxedl010KJE=; b=Ca6E7NXps9QBoc1PxreOxXIWS5kQNMetKHyRiYG55jT2L+S7awjudN67cD/bcguFYN uyXSoE3ReFftEzA7emzXfhreOwvVM17RoCdLy7gXu+fam2APK8EebbwriACFfTTgzayl oA79rqKRw5SYGDGOw0F4ZcKZ0nwDq0qoNIHA7mrPdRxPW2/rC7NmlphG9HQw6hz0jKFc RlqX6m2yFrE9hbadDAXRurKJKoKZKMPHQtNvSK3Zv3bEcbqEg/J8S0jXWjr5dsM6Y/Ur KM3pZu1uWNthyhVKhohr/R1HRxS1QekaTSC9611ks45JGDwIfWauuq86u6xLREIvOxHN vvcg== X-Gm-Message-State: AHPjjUi9gG6s/YdsyD/wM/RvMFxbBJKHA6HbXGEYa64lf9w8LVm9omBg 6sWIM6PbxuTdmeOd3pEhd0BIAA== X-Google-Smtp-Source: AOwi7QA4a2j+6EgTSIK8qdllBRRCEtJ2KztChgxb8E68tmLNr8fcQ3RPkBkftxPSjbyQWU5bT6rxWg== X-Received: by 10.107.133.24 with SMTP id h24mr6534705iod.87.1506274934722; Sun, 24 Sep 2017 10:42:14 -0700 (PDT) Original-Received: from zebian ([45.2.119.34]) by smtp.googlemail.com with ESMTPSA id m123sm2133535iom.25.2017.09.24.10.42.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 24 Sep 2017 10:42:14 -0700 (PDT) In-Reply-To: (Ross Donaldson's message of "Sun, 24 Sep 2017 17:02:05 +0000") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:137350 Archived-At: Ross Donaldson writes: > From 83a622ec32a64ae30e68de18a84cc32fc6a811d9 Mon Sep 17 00:00:00 2001 > From: Ross Donaldson > 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. You're missing the ChangeLog style entry here, see CONTRIBUTE under "Commit messages" for details. Also, an imperative style usually reads more concisely ("Provide customization..." rather than "This provides..."). I think a NEWS entry would be appropriate as well. > - :safe' booleanp) > + :safe 'booleanp) It's better not to mix up your change with unrelated whitespace fixes. > (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" This should rather be "26.1", as released Emacs versions always end in ".1". > + :type 'integer > + :safe (lambda (i) (and (integerp i) (< 0 i)))) I would probably go with 'natnump here. This does also allow 0 which is probably not generally wanted, but still "safe", I think. > (`(,(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))))))) A line break here would keep the line to within a reasonable width (generally we try to stay in 80 columns). Thanks for working on this.