diff options
| author | Barry Warsaw <barry@python.org> | 2002-10-21 15:58:29 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2002-10-21 15:58:29 (GMT) |
| commit | 644991fa35920f8ccdf9af66f1e6f90f79c1cf87 (patch) | |
| tree | 898c87f58e29d4cc90b20189dd6f7cdf6cd9ab8a | |
| parent | 5c458052f0411ee97cb6c2bebfcaa59ecda60f4d (diff) | |
| download | cpython-644991fa35920f8ccdf9af66f1e6f90f79c1cf87.zip cpython-644991fa35920f8ccdf9af66f1e6f90f79c1cf87.tar.gz cpython-644991fa35920f8ccdf9af66f1e6f90f79c1cf87.tar.bz2 | |
(py-parse-state-re): Remove the "if" from the regular expression.
This fixes an indentation bug reported by Jeremy when seeing multiple
list comprehensions like so:
[x for x in seq
if blah(x)]
# ...
[y for y in seq
if blah(y)]
The reason this broke is because this regexp caused the "find a safe
parsing start location higher up in the file" test to erroneously find
the if in the listcomp. I think the other keywords in this regexp are
fine and good enough.
After a weekend of testing, I can't find any adverse effects.
| -rw-r--r-- | Misc/python-mode.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Misc/python-mode.el b/Misc/python-mode.el index bf4c4d5..6ae0c9b 100644 --- a/Misc/python-mode.el +++ b/Misc/python-mode.el @@ -3148,7 +3148,7 @@ local bindings to py-newline-and-indent.")) ;; Helper functions (defvar py-parse-state-re (concat - "^[ \t]*\\(if\\|elif\\|else\\|while\\|def\\|class\\)\\>" + "^[ \t]*\\(elif\\|else\\|while\\|def\\|class\\)\\>" "\\|" "^[^ #\t\n]")) |