From ad2814fd38d452e9f96ee481f88f662df6ebca15 Mon Sep 17 00:00:00 2001 From: Tomohisa Kuranari Date: Fri, 22 Sep 2023 22:38:26 +0900 Subject: [PATCH] lisp/org.el: Fix the issue with argumented function calls * lisp/org.el (org-beginning-of-line, org-end-of-line): Fix issue with org-special-ctrl-a/e not working correctly when moving with arguments * testing/lisp/test-org.el (test-org/beginning-of-line, test-org/end-of-line): Add new tests. --- lisp/org.el | 12 ++++++-- testing/lisp/test-org.el | 62 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 3 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index d0b2355ea..5ab4af432 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20331,7 +20331,9 @@ With argument N not nil or 1, move forward N - 1 lines first." (if (eq special 'reversed) (when (and (= origin bol) (eq last-command this-command)) (goto-char refpos)) - (when (or (> origin refpos) (= origin bol)) + (when (or (> origin refpos) + (= origin bol) + (/= (line-number-at-pos origin) (line-number-at-pos bol))) (goto-char refpos))))) ((and (looking-at org-list-full-item-re) (org-element-type-p @@ -20347,7 +20349,9 @@ With argument N not nil or 1, move forward N - 1 lines first." (if (eq special 'reversed) (when (and (= (point) origin) (eq last-command this-command)) (goto-char after-bullet)) - (when (or (> origin after-bullet) (= (point) origin)) + (when (or (> origin after-bullet) + (= (point) origin) + (/= (line-number-at-pos origin) (line-number-at-pos (point)))) (goto-char after-bullet))))) ;; No special context. Point is already at beginning of line. (t nil)))) @@ -20402,7 +20406,9 @@ With argument N not nil or 1, move forward N - 1 lines first." (goto-char tags) (end-of-line))) (t - (if (or (< origin tags) (= origin (line-end-position))) + (if (or (< origin tags) + (= origin (line-end-position)) + (/= (line-number-at-pos origin) (line-number-at-pos (point)))) (goto-char tags) (end-of-line)))))) ((bound-and-true-p visual-line-mode) diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el index 8355e2d77..63fd16b40 100644 --- a/testing/lisp/test-org.el +++ b/testing/lisp/test-org.el @@ -4460,6 +4460,16 @@ asd (let ((org-special-ctrl-a/e '(nil . nil))) (org-beginning-of-line) (looking-at "Headline")))) + (should + (org-test-with-temp-text "* TODO [#A] Headline\n" + (let ((org-special-ctrl-a/e t)) + (org-beginning-of-line 0) + (looking-at-p "Headline")))) + (should + (org-test-with-temp-text "\n* TODO [#A] Headline" + (let ((org-special-ctrl-a/e t)) + (org-beginning-of-line 2) + (looking-at-p "Headline")))) ;; At an headline with reversed movement, first move to beginning of ;; line, then to the beginning of title. (should @@ -4480,6 +4490,18 @@ asd (this-command last-command)) (and (progn (org-beginning-of-line) (bolp)) (progn (org-beginning-of-line) (looking-at-p "Headline")))))) + (should + (org-test-with-temp-text "* TODO Headline\n" + (let ((org-special-ctrl-a/e 'reversed) + (this-command last-command)) + (and (progn (org-beginning-of-line 0) (bolp)) + (progn (org-beginning-of-line) (looking-at-p "Headline")))))) + (should + (org-test-with-temp-text "\n* TODO Headline" + (let ((org-special-ctrl-a/e 'reversed) + (this-command last-command)) + (and (progn (org-beginning-of-line 2) (bolp)) + (progn (org-beginning-of-line) (looking-at-p "Headline")))))) ;; At an item with special movement, first move after to beginning ;; of title, then to the beginning of line, rinse, repeat. (should @@ -4488,6 +4510,14 @@ asd (and (progn (org-beginning-of-line) (looking-at-p "Item")) (progn (org-beginning-of-line) (bolp)) (progn (org-beginning-of-line) (looking-at-p "Item")))))) + (should + (org-test-with-temp-text "- [ ] Item\n" + (let ((org-special-ctrl-a/e t)) + (org-beginning-of-line 0) (looking-at-p "Item")))) + (should + (org-test-with-temp-text "\n- [ ] Item" + (let ((org-special-ctrl-a/e t)) + (org-beginning-of-line 2) (looking-at-p "Item")))) ;; At an item with reversed movement, first move to beginning of ;; line, then to the beginning of title. (should @@ -4496,6 +4526,18 @@ asd (this-command last-command)) (and (progn (org-beginning-of-line) (bolp)) (progn (org-beginning-of-line) (looking-at-p "Item")))))) + (should + (org-test-with-temp-text "- [X] Item\n" + (let ((org-special-ctrl-a/e 'reversed) + (this-command last-command)) + (and (progn (org-beginning-of-line 0) (bolp)) + (progn (org-beginning-of-line) (looking-at-p "Item")))))) + (should + (org-test-with-temp-text "\n- [X] Item" + (let ((org-special-ctrl-a/e 'reversed) + (this-command last-command)) + (and (progn (org-beginning-of-line 2) (bolp)) + (progn (org-beginning-of-line) (looking-at-p "Item")))))) ;; Leave point before invisible characters at column 0. (should (org-test-with-temp-text "[[https://orgmode.org]]" @@ -4598,6 +4640,14 @@ asd (and (progn (org-end-of-line) (looking-at-p " :tag:")) (progn (org-end-of-line) (eolp)) (progn (org-end-of-line) (looking-at-p " :tag:")))))) + (should + (org-test-with-temp-text "* Headline1 :tag:\n" + (let ((org-special-ctrl-a/e t)) + (org-end-of-line 0) (looking-at-p " :tag:")))) + (should + (org-test-with-temp-text "\n* Headline1 :tag:\n" + (let ((org-special-ctrl-a/e t)) + (org-end-of-line 2) (looking-at-p " :tag:")))) (should (org-test-with-temp-text "* Headline2a :tag:\n** Sub" (org-overview) @@ -4625,6 +4675,18 @@ asd (this-command last-command)) (and (progn (org-end-of-line) (eolp)) (progn (org-end-of-line) (looking-at-p " :tag:")))))) + (should + (org-test-with-temp-text "* Headline3 :tag:\n" + (let ((org-special-ctrl-a/e 'reversed) + (this-command last-command)) + (and (progn (org-end-of-line 0) (eolp)) + (progn (org-end-of-line) (looking-at-p " :tag:")))))) + (should + (org-test-with-temp-text "\n* Headline3 :tag:\n" + (let ((org-special-ctrl-a/e 'reversed) + (this-command last-command)) + (and (progn (org-end-of-line 2) (eolp)) + (progn (org-end-of-line) (looking-at-p " :tag:")))))) (should (org-test-with-temp-text "* Headline2a :tag:\n** Sub" (org-overview) -- 2.42.0