forked from mirrors/org-mode
Merge branch 'bugfix'
This commit is contained in:
commit
6feef2a279
|
@ -20340,7 +20340,7 @@ With argument N not nil or 1, move forward N - 1 lines first."
|
||||||
(if (eq special 'reversed)
|
(if (eq special 'reversed)
|
||||||
(when (and (= origin bol) (eq last-command this-command))
|
(when (and (= origin bol) (eq last-command this-command))
|
||||||
(goto-char refpos))
|
(goto-char refpos))
|
||||||
(when (or (> origin refpos) (= origin bol))
|
(when (or (> origin refpos) (<= origin bol))
|
||||||
(goto-char refpos)))))
|
(goto-char refpos)))))
|
||||||
((and (looking-at org-list-full-item-re)
|
((and (looking-at org-list-full-item-re)
|
||||||
(org-element-type-p
|
(org-element-type-p
|
||||||
|
@ -20356,7 +20356,7 @@ With argument N not nil or 1, move forward N - 1 lines first."
|
||||||
(if (eq special 'reversed)
|
(if (eq special 'reversed)
|
||||||
(when (and (= (point) origin) (eq last-command this-command))
|
(when (and (= (point) origin) (eq last-command this-command))
|
||||||
(goto-char after-bullet))
|
(goto-char after-bullet))
|
||||||
(when (or (> origin after-bullet) (= (point) origin))
|
(when (or (> origin after-bullet) (>= (point) origin))
|
||||||
(goto-char after-bullet)))))
|
(goto-char after-bullet)))))
|
||||||
;; No special context. Point is already at beginning of line.
|
;; No special context. Point is already at beginning of line.
|
||||||
(t nil))))
|
(t nil))))
|
||||||
|
@ -20411,7 +20411,7 @@ With argument N not nil or 1, move forward N - 1 lines first."
|
||||||
(goto-char tags)
|
(goto-char tags)
|
||||||
(end-of-line)))
|
(end-of-line)))
|
||||||
(t
|
(t
|
||||||
(if (or (< origin tags) (= origin (line-end-position)))
|
(if (or (< origin tags) (>= origin (line-end-position)))
|
||||||
(goto-char tags)
|
(goto-char tags)
|
||||||
(end-of-line))))))
|
(end-of-line))))))
|
||||||
((bound-and-true-p visual-line-mode)
|
((bound-and-true-p visual-line-mode)
|
||||||
|
|
|
@ -4460,6 +4460,16 @@ asd
|
||||||
(let ((org-special-ctrl-a/e '(nil . nil)))
|
(let ((org-special-ctrl-a/e '(nil . nil)))
|
||||||
(org-beginning-of-line)
|
(org-beginning-of-line)
|
||||||
(looking-at "Headline"))))
|
(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
|
;; At an headline with reversed movement, first move to beginning of
|
||||||
;; line, then to the beginning of title.
|
;; line, then to the beginning of title.
|
||||||
(should
|
(should
|
||||||
|
@ -4480,6 +4490,18 @@ asd
|
||||||
(this-command last-command))
|
(this-command last-command))
|
||||||
(and (progn (org-beginning-of-line) (bolp))
|
(and (progn (org-beginning-of-line) (bolp))
|
||||||
(progn (org-beginning-of-line) (looking-at-p "Headline"))))))
|
(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
|
;; At an item with special movement, first move after to beginning
|
||||||
;; of title, then to the beginning of line, rinse, repeat.
|
;; of title, then to the beginning of line, rinse, repeat.
|
||||||
(should
|
(should
|
||||||
|
@ -4488,6 +4510,14 @@ asd
|
||||||
(and (progn (org-beginning-of-line) (looking-at-p "Item"))
|
(and (progn (org-beginning-of-line) (looking-at-p "Item"))
|
||||||
(progn (org-beginning-of-line) (bolp))
|
(progn (org-beginning-of-line) (bolp))
|
||||||
(progn (org-beginning-of-line) (looking-at-p "Item"))))))
|
(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
|
;; At an item with reversed movement, first move to beginning of
|
||||||
;; line, then to the beginning of title.
|
;; line, then to the beginning of title.
|
||||||
(should
|
(should
|
||||||
|
@ -4496,6 +4526,18 @@ asd
|
||||||
(this-command last-command))
|
(this-command last-command))
|
||||||
(and (progn (org-beginning-of-line) (bolp))
|
(and (progn (org-beginning-of-line) (bolp))
|
||||||
(progn (org-beginning-of-line) (looking-at-p "Item"))))))
|
(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.
|
;; Leave point before invisible characters at column 0.
|
||||||
(should
|
(should
|
||||||
(org-test-with-temp-text "[[https://orgmode.org]]<point>"
|
(org-test-with-temp-text "[[https://orgmode.org]]<point>"
|
||||||
|
@ -4598,6 +4640,14 @@ asd
|
||||||
(and (progn (org-end-of-line) (looking-at-p " :tag:"))
|
(and (progn (org-end-of-line) (looking-at-p " :tag:"))
|
||||||
(progn (org-end-of-line) (eolp))
|
(progn (org-end-of-line) (eolp))
|
||||||
(progn (org-end-of-line) (looking-at-p " :tag:"))))))
|
(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
|
(should
|
||||||
(org-test-with-temp-text "* Headline2a :tag:\n** Sub"
|
(org-test-with-temp-text "* Headline2a :tag:\n** Sub"
|
||||||
(org-overview)
|
(org-overview)
|
||||||
|
@ -4625,6 +4675,18 @@ asd
|
||||||
(this-command last-command))
|
(this-command last-command))
|
||||||
(and (progn (org-end-of-line) (eolp))
|
(and (progn (org-end-of-line) (eolp))
|
||||||
(progn (org-end-of-line) (looking-at-p " :tag:"))))))
|
(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
|
(should
|
||||||
(org-test-with-temp-text "* Headline2a :tag:\n** Sub"
|
(org-test-with-temp-text "* Headline2a :tag:\n** Sub"
|
||||||
(org-overview)
|
(org-overview)
|
||||||
|
|
Loading…
Reference in New Issue