org-list: Do not move point and change space when promoting/demoting items

* lisp/org-list.el (org-list-struct-apply-struct): Make sure the
origin marker is not moved to bol when promoting/demoting item in
special case:
 - item
 - <point> ::
Do not remove the trailing space after point as well.
(org-insert-item): Do not expect point to remain at bol after writing
list struct.

* testing/lisp/test-org-list.el (test-org-list/indent-item): Add tests.

Fixes https://orgmode.org/list/87o88hlkvv.fsf@gmail.com
This commit is contained in:
Ihor Radchenko 2021-10-02 18:32:34 +08:00
parent a8b32247d9
commit ed6f8dc67f
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 29 additions and 2 deletions

View File

@ -1940,7 +1940,19 @@ Initial position of cursor is restored after the changes."
(looking-at org-list-full-item-re) (looking-at org-list-full-item-re)
;; a. Replace bullet ;; a. Replace bullet
(unless (equal old-bul new-bul) (unless (equal old-bul new-bul)
(replace-match new-bul nil nil nil 1)) (let ((keep-space ""))
(save-excursion
;; If origin is inside the bullet, preserve the
;; spaces after origin.
(when (<= (match-beginning 1) origin (match-end 1))
(org-with-point-at origin
(save-match-data
(when (looking-at "[ \t]+")
(setq keep-space (match-string 0))))))
(replace-match "" nil nil nil 1)
(goto-char (match-end 1))
(insert-before-markers new-bul)
(insert keep-space))))
;; b. Replace checkbox. ;; b. Replace checkbox.
(cond (cond
((equal (match-string 3) new-box)) ((equal (match-string 3) new-box))
@ -2286,6 +2298,7 @@ item is invisible."
(setq struct (org-list-insert-item pos struct prevs checkbox desc)) (setq struct (org-list-insert-item pos struct prevs checkbox desc))
(org-list-write-struct struct (org-list-parents-alist struct)) (org-list-write-struct struct (org-list-parents-alist struct))
(when checkbox (org-update-checkbox-count-maybe)) (when checkbox (org-update-checkbox-count-maybe))
(beginning-of-line)
(looking-at org-list-full-item-re) (looking-at org-list-full-item-re)
(goto-char (if (and (match-beginning 4) (goto-char (if (and (match-beginning 4)
(save-match-data (save-match-data

View File

@ -298,7 +298,21 @@ b. Item 2<point>"
(push-mark (point) t t) (push-mark (point) t t)
(goto-char (point-max)) (goto-char (point-max))
(let (org-list-demote-modify-bullet) (org-indent-item)) (let (org-list-demote-modify-bullet) (org-indent-item))
(buffer-string))))) (buffer-string))))
;; When point is right after empty item, do not move point.
(should
(= 13
(org-test-with-temp-text "
- item
- <point> ::"
(org-indent-item)
(point))))
;; Preserve space after point upon promoting level.
(org-test-with-temp-text "
- item
- <point> ::"
(org-indent-item)
(should (looking-at-p " \t"))))
(ert-deftest test-org-list/indent-item-tree () (ert-deftest test-org-list/indent-item-tree ()
"Test `org-indent-item-tree' specifications." "Test `org-indent-item-tree' specifications."