From: Hong Xu <hong@topbug.net>
To: 22661@debbugs.gnu.org
Cc: matthew@woodcraft.me.uk
Subject: bug#22661: 25.0.91; python.el electric-indent misbehaviour with 'else:' and nested 'if:'
Date: Mon, 12 Dec 2016 18:01:06 -0800 [thread overview]
Message-ID: <878trky4d9.fsf@topbug.net> (raw)
In-Reply-To: <87a8n3z0ac.fsf@golux.woodcraft.me.uk>
[-- Attachment #1.1: Type: text/plain, Size: 336 bytes --]
> If I have the following code and add the colon after the 'else',
> python.el's electric-indent moves the 'else' to align with the inner
> 'if'.
> def foo()
> if aaa:
> if bbb:
> x = 1
> y = 1
> else
I've attached a patch to fix this issue: It is caused by incorrect
detection of opening blocks.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-python-mode-Fix-detection-for-opening-blocks.patch --]
[-- Type: text/x-diff, Size: 2415 bytes --]
From: Hong Xu <hong@topbug.net>
Date: Mon, 12 Dec 2016 17:55:25 -0800
Subject: [PATCH] python-mode: Fix detection for opening blocks (bug# 22661).
* python.el (python-info-dedenter-opening-block-positions): There
can't be any back-indented lines between an opening block and the
current line.
---
lisp/progmodes/python.el | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index d0d4a7f766ef..8d3bd3194151 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4660,7 +4660,8 @@ python-info-dedenter-opening-block-positions
(let ((dedenter-pos (python-info-dedenter-statement-p)))
(when dedenter-pos
(goto-char dedenter-pos)
- (let* ((pairs '(("elif" "elif" "if")
+ (let* ((cur-line (line-beginning-position))
+ (pairs '(("elif" "elif" "if")
("else" "if" "elif" "except" "for" "while")
("except" "except" "try")
("finally" "else" "except" "try")))
@@ -4676,7 +4677,18 @@ python-info-dedenter-opening-block-positions
(let ((indentation (current-indentation)))
(when (and (not (memq indentation collected-indentations))
(or (not collected-indentations)
- (< indentation (apply #'min collected-indentations))))
+ (< indentation (apply #'min collected-indentations)))
+ ;; There must be no line with indentation smaller than
+ ;; `indentation' between the found opening block and the
+ ;; current line, otherwise it is not an opening block.
+ (save-excursion
+ (forward-line)
+ (let ((no-back-indent t))
+ (while (and (< (point) cur-line)
+ (setq no-back-indent
+ (> (current-indentation) indentation)))
+ (forward-line))
+ no-back-indent)))
(setq collected-indentations
(cons indentation collected-indentations))
(when (member (match-string-no-properties 0)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
next prev parent reply other threads:[~2016-12-13 2:01 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-14 17:09 bug#22661: 25.0.91; python.el electric-indent misbehaviour with 'else:' and nested 'if:' Matthew Woodcraft
2016-12-13 2:01 ` Hong Xu [this message]
2017-01-21 17:34 ` Matthew Woodcraft
2017-01-22 2:08 ` Hong Xu
2017-01-22 22:34 ` Matthew Woodcraft
2017-01-22 23:08 ` npostavs
2017-01-23 0:50 ` Hong Xu
2017-01-24 1:24 ` npostavs
2017-01-27 1:20 ` npostavs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878trky4d9.fsf@topbug.net \
--to=hong@topbug.net \
--cc=22661@debbugs.gnu.org \
--cc=matthew@woodcraft.me.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).