From: npostavs@users.sourceforge.net
To: Hong Xu <hong@topbug.net>
Cc: Matthew Woodcraft <matthew@woodcraft.me.uk>, 22661@debbugs.gnu.org
Subject: bug#22661: 25.0.91; python.el electric-indent misbehaviour with 'else:' and nested 'if:'
Date: Sun, 22 Jan 2017 18:08:03 -0500 [thread overview]
Message-ID: <87fukavgks.fsf@users.sourceforge.net> (raw)
In-Reply-To: <877f5nu9qn.fsf@topbug.net> (Hong Xu's message of "Sat, 21 Jan 2017 18:08:48 -0800")
Hong Xu <hong@topbug.net> writes:
> 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.
Looks good, with a minor adjustment I suggested below. Adding a test
would be nice too.
> ---
> 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))
I think it's better to maximize the range of save-match-data, i.e., have
it cover as much code as practical between the place that sets the match
data and the place that uses the it, rather than minimizing the range so
that it only covers functions which modify match data (because the
default assumption in Emacs is that functions may modify match data
unless they say otherwise). In this case, I would put it around the
`and` in the line above.
> (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)
next prev parent reply other threads:[~2017-01-22 23: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
2017-01-22 22:34 ` Matthew Woodcraft
2017-01-22 23:08 ` npostavs [this message]
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=87fukavgks.fsf@users.sourceforge.net \
--to=npostavs@users.sourceforge.net \
--cc=22661@debbugs.gnu.org \
--cc=hong@topbug.net \
--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.