diff options
| author | kobarity <kobarity@gmail.com> | 2022-08-15 16:30:23 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2022-08-15 16:30:23 +0200 |
| commit | 0d3aebec0141ab57362477c50065222a03d57c08 (patch) | |
| tree | 4d55d885963c668ccb58fa4084ba326e22721574 | |
| parent | 5025b2566e72ba37b62c2a00feef46268fc9f468 (diff) | |
| download | emacs-0d3aebec0141ab57362477c50065222a03d57c08.tar.gz | |
Fix `python-nav-forward-block' moving backward under certain conditions
* lisp/progmodes/python.el (python-nav-forward-block): Add check
for not moving backward (bug#57223).
| -rw-r--r-- | lisp/progmodes/python.el | 6 | ||||
| -rw-r--r-- | test/lisp/progmodes/python-tests.el | 16 |
2 files changed, 20 insertions, 2 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 96f9d14832d..44df3186b27 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -1822,7 +1822,8 @@ backward to previous block." (or arg (setq arg 1)) (let ((block-start-regexp (python-rx line-start (* whitespace) block-start)) - (starting-pos (point))) + (starting-pos (point)) + (orig-arg arg)) (while (> arg 0) (python-nav-end-of-statement) (while (and @@ -1836,7 +1837,8 @@ backward to previous block." (python-syntax-context-type))) (setq arg (1+ arg))) (python-nav-beginning-of-statement) - (if (not (looking-at (python-rx block-start))) + (if (or (and (> orig-arg 0) (< (point) starting-pos)) + (not (looking-at (python-rx block-start)))) (and (goto-char starting-pos) nil) (and (not (= (point) starting-pos)) (point-marker))))) diff --git a/test/lisp/progmodes/python-tests.el b/test/lisp/progmodes/python-tests.el index d303050fad9..9e8fa7f5520 100644 --- a/test/lisp/progmodes/python-tests.el +++ b/test/lisp/progmodes/python-tests.el @@ -2942,6 +2942,22 @@ if request.user.is_authenticated(): (python-tests-look-at "if request.user.is_authenticated():" -1))))) +(ert-deftest python-nav-forward-block-2 () + (python-tests-with-temp-buffer + " +if True: + pass +" + (python-tests-look-at "if True:") + (should (not (save-excursion (python-nav-forward-block)))) + (should (not (save-excursion (python-nav-forward-block -1)))) + (forward-char) + (should (not (save-excursion (python-nav-forward-block)))) + (should (= (save-excursion (python-nav-forward-block -1)) + (progn + (end-of-line) + (python-tests-look-at "if True:" -1)))))) + (ert-deftest python-nav-forward-sexp-1 () (python-tests-with-temp-buffer " |