From: Hong Xu <hong@topbug.net>
To: Matthew Woodcraft <matthew@woodcraft.me.uk>
Cc: 22661@debbugs.gnu.org
Subject: bug#22661: 25.0.91; python.el electric-indent misbehaviour with 'else:' and nested 'if:'
Date: Sat, 21 Jan 2017 18:08:48 -0800 [thread overview]
Message-ID: <877f5nu9qn.fsf@topbug.net> (raw)
In-Reply-To: <87d1fgiaf2.fsf@golux.woodcraft.me.uk>
[-- Attachment #1.1: Type: text/plain, Size: 774 bytes --]
On 2017-01-21 Sat 09:34 GMT-0800, Matthew Woodcraft <matthew@woodcraft.me.uk> wrote:
>
> I have tested this patch and it does fix the case I posted.
>
> But it misbehaves if I add a blank line before the 'else':
>
> def foo()
> if aaa:
> if bbb:
> x = 1
> y = 1
>
> else
>
> Now when I add the colon after the 'else', electric-indent moves the
> 'else' to align with the 'def'.
>
>
> I agree that python-info-dedenter-opening-block-positions is the right
> thing to fix.
>
> I think it's sufficient to look at the last nonblank line above the
> current line, rather than all lines between the candidate opening block
> and the current line.
>
> -M-
Thanks for your suggestion, Matthew. I've now fixed it in the new patch
as attached.
[-- 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: 2795 bytes --]
From b9b742e15174de6abe5134427964fe4e0f852461 Mon Sep 17 00:00:00 2001
From: Hong Xu <hong@topbug.net>
Date: Mon, 12 Dec 2016 17:55:25 -0800
Subject: [PATCH] python-mode: Fix detection for opening blocks.
* 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 | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 306402d8e3b4..ae9b0890cfc2 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -4659,7 +4659,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")))
@@ -4675,7 +4676,22 @@ 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' (except for
+ ;; blank lines) 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
+ (or (> (current-indentation) indentation)
+ (save-match-data
+ (python-info-current-line-empty-p)))))
+ (forward-line))
+ no-back-indent)))
(setq collected-indentations
(cons indentation collected-indentations))
(when (member (match-string-no-properties 0)
--
2.1.4
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]
next prev parent reply other threads:[~2017-01-22 2:08 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
2017-01-21 17:34 ` Matthew Woodcraft
2017-01-22 2:08 ` Hong Xu [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=877f5nu9qn.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.