summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkobarity <kobarity@gmail.com>2023-03-05 17:07:17 +0900
committerEli Zaretskii <eliz@gnu.org>2023-03-09 12:14:15 +0200
commit6fe9075ff3814ce825c9869c901903edad9d0b44 (patch)
tree2ccde29bba0fabb1a64763dcc41bce414be84f87
parentf175141aeade5d6795d22d40c1eb001c6ba49025 (diff)
downloademacs-6fe9075ff38.tar.gz
Revert workaround introduced in Bug#56271
* lisp/progmodes/python.el (python-nav-end-of-statement) (python-nav-end-of-block): Revert workaround introduced in Bug#56271 as the bug is fixedin Bug#58780.
-rw-r--r--lisp/progmodes/python.el9
1 files changed, 1 insertions, 8 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index ccf78e13148..5b11d204de1 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2062,10 +2062,6 @@ of the statement."
;; are somehow out of whack. This has been
;; observed when using `syntax-ppss' during
;; narrowing.
- ;; It can also fail in cases where the buffer is in
- ;; the process of being modified, e.g. when creating
- ;; a string with `electric-pair-mode' disabled such
- ;; that there can be an unmatched single quote
(when (>= string-start last-string-end)
(goto-char string-start)
(if (python-syntax-context 'paren)
@@ -2154,10 +2150,7 @@ backward to previous statement."
(while (and (forward-line 1)
(not (eobp))
(or (and (> (current-indentation) block-indentation)
- (let ((start (point)))
- (python-nav-end-of-statement)
- ;; must move forward otherwise infinite loop
- (> (point) start)))
+ (or (python-nav-end-of-statement) t))
(python-info-current-line-comment-p)
(python-info-current-line-empty-p))))
(python-util-forward-comment -1)