procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert workaround introduced in Bug#56271

Browse source 
* 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.
This commit is contained in:
kobarity 2023-03-05 17:07:17 +09:00 • committed by Eli Zaretskii
parent f175141aea
commit 6fe9075ff3
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/progmodes/python.el
View file

@ -2062,10 +2062,6 @@ of the statement."
;; are somehow out of whack. This has been ;; are somehow out of whack. This has been
;; observed when using `syntax-ppss' during ;; observed when using `syntax-ppss' during
;; narrowing. ;; 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) (when (>= string-start last-string-end)
(goto-char string-start) (goto-char string-start)
(if (python-syntax-context 'paren) (if (python-syntax-context 'paren)
@ -2154,10 +2150,7 @@ backward to previous statement."
(while (and (forward-line 1) (while (and (forward-line 1)
(not (eobp)) (not (eobp))
(or (and (> (current-indentation) block-indentation) (or (and (> (current-indentation) block-indentation)
(let ((start (point))) (or (python-nav-end-of-statement) t))
(python-nav-end-of-statement)
;; must move forward otherwise infinite loop
(> (point) start)))
(python-info-current-line-comment-p) (python-info-current-line-comment-p)
(python-info-current-line-empty-p)))) (python-info-current-line-empty-p))))
(python-util-forward-comment -1) (python-util-forward-comment -1)