tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

list: Fix item insertion when split point is near blanks

Browse source 
* lisp/org-list.el (org-list-insert-item): Ignore blanks around cut
position.
* testing/lisp/test-org-list.el (test-org-list/insert-item): Add test.

Reported-by: Samuel Wales <samologist@gmail.com>
<http://lists.gnu.org/r/emacs-orgmode/2020-08/msg00065.html>
This commit is contained in:
Nicolas Goaziou 2020-08-16 11:42:53 +02:00
parent 3f04ad8d2c
commit 567662d5b0
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lisp/org-list.el
View file

@ -1292,8 +1292,11 @@ This function modifies STRUCT."
(when (< item-end pos)
(delete-region (1- item-end) (point-at-eol)))
(skip-chars-backward " \r\t\n")
(setq pos (point))
(delete-and-extract-region pos item-end-no-blank))))
;; Cut position is after any blank on the line.
(save-excursion
(skip-chars-forward " \t")
(setq pos (point)))
(delete-and-extract-region (point) item-end-no-blank))))
(body
(concat bullet
(and box (concat box " "))
@ -1325,12 +1328,15 @@ This function modifies STRUCT."
(setcar e (+ p item-size))
(setcar (nthcdr 6 e) (+ end size-offset)))
;; Items starting after modified item fall into two
;; categories. If item was split, and current item was
;; located after split point, it was moved to the new item.
;; This means that the part between body start of body and
;; split point was removed. So we compute the offset and
;; shift item's positions accordingly. In any other case,
;; the item was simply shifted by SIZE-OFFSET.
;; categories.
;;
;; If modified item was split, and current sub-item was
;; located after split point, it was moved to the new item:
;; the part between body start and split point (POS) was
;; removed. So we compute the length of that part and shift
;; item's positions accordingly.
;;
;; Otherwise, the item was simply shifted by SIZE-OFFSET.
((and split-line-p (not beforep) (>= p pos) (<= p item-end-no-blank))
(let ((offset (- pos item ind (length bullet) (length after-bullet))))
(setcar e (- p offset))

8
testing/lisp/test-org-list.el
View file

@ -892,7 +892,13 @@ b. Item 2<point>"
(= 0
(org-test-with-temp-text "- item\n - sub-list\n resume item<point>"
(org-insert-item)
(current-indentation)))))
(current-indentation))))
;; Test splitting with blanks around.
(should
(equal "- A\n B\n- C\n - D\n- [ ] E"
(org-test-with-temp-text "- A\n B <point> C\n - D\n- [ ] E"
(org-insert-item)
(buffer-string)))))
(ert-deftest test-org-list/repair ()
"Test `org-list-repair' specifications."