From: 倉成智久 <tomohisa.kuranari@gmail.com>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Fix org-[beginning|end]-of-line with arguments
Date: Tue, 26 Sep 2023 23:38:28 +0900 [thread overview]
Message-ID: <CAL-TYF4vz6t4MuOSisY8g5v-87iUzZu_Fm22dxJoujj14po0RA@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 697 bytes --]
Hello,
I have created a patch to fix an issue concerning the
org-beginning-of-line and org-end-of-line functions with arguments.
In the current implementation, org-special-ctrl-a/e may not operate as expected.
For example, executing (org-beginning-of-line 2) relocates the cursor
to the start of the line, rather than after the heading symbols even
if org-special-ctrl-a/e is t.
(Movements to prior lines, such as (org-beginning-of-line 0), function
correctly.)
This is my first patch submission. If there are any shortcomings or
additional requirements needed, please do not hesitate to inform me. I
am open to feedback and willing to make any necessary adjustments.
Best,
Tomohisa Kuranari
[-- Attachment #2: 0001-lisp-org.el-Fix-the-issue-with-argumented-function-c.patch --]
[-- Type: application/octet-stream, Size: 6713 bytes --]
From ad2814fd38d452e9f96ee481f88f662df6ebca15 Mon Sep 17 00:00:00 2001
From: Tomohisa Kuranari <tomohisa.kuranari@gmail.com>
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<point>"
+ (let ((org-special-ctrl-a/e t))
+ (org-beginning-of-line 0)
+ (looking-at-p "Headline"))))
+ (should
+ (org-test-with-temp-text "<point>\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<point>"
+ (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 "<point>\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<point>"
+ (let ((org-special-ctrl-a/e t))
+ (org-beginning-of-line 0) (looking-at-p "Item"))))
+ (should
+ (org-test-with-temp-text "<point>\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<point>"
+ (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 "<point>\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]]<point>"
@@ -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<point>"
+ (let ((org-special-ctrl-a/e t))
+ (org-end-of-line 0) (looking-at-p " :tag:"))))
+ (should
+ (org-test-with-temp-text "<point>\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<point>"
+ (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 "<point>\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
next reply other threads:[~2023-09-26 14:39 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-26 14:38 倉成智久 [this message]
2023-10-05 10:04 ` [PATCH] Fix org-[beginning|end]-of-line with arguments Ihor Radchenko
2023-10-08 14:23 ` Tomohisa Kuranari
2023-11-07 9:50 ` Ihor Radchenko
2023-11-07 10:12 ` Bastien Guerry
2023-11-07 10:56 ` Ihor Radchenko
2023-11-07 14:38 ` Tomohisa Kuranari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAL-TYF4vz6t4MuOSisY8g5v-87iUzZu_Fm22dxJoujj14po0RA@mail.gmail.com \
--to=tomohisa.kuranari@gmail.com \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).