ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-01-30 12:06:49 +03:00
parent aa48c80fe1 c340e799f8
commit 0509a84786
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-element.el
View File

@ -7702,7 +7702,15 @@ the cache."
(when org-element-cache-map-continue-from (when org-element-cache-map-continue-from
(goto-char org-element-cache-map-continue-from)) (goto-char org-element-cache-map-continue-from))
(when (> (point) start) (when (> (point) start)
(move-start-to-next-match nil)) (move-start-to-next-match nil)
;; (point) inside matching element.
;; Go further.
(when (> (point) start)
(setq data (element-match-at-point))
(if (not data)
(cache-walk-abort)
(goto-char (next-element-start))
(move-start-to-next-match next-element-re))))
;; Drop nil. ;; Drop nil.
(unless (car result) (pop result))) (unless (car result) (pop result)))
;; If FUNC did not move the point and we ;; If FUNC did not move the point and we

22
testing/lisp/test-org.el
View File

@ -2740,7 +2740,27 @@ SCHEDULED: <2014-03-04 tue.>"
(setq org-map-continue-from (setq org-map-continue-from
(org-element-property (org-element-property
:begin (org-element-at-point)))))) :begin (org-element-at-point))))))
(buffer-string))))) (buffer-string))))
(should
(= 1
(org-test-with-temp-text "* H1\n** H1.1\n** H1.2\n"
(let (acc)
(org-map-entries
(lambda ()
(push (org-element-property :title (org-element-at-point)) acc)
(setq org-map-continue-from
(org-element-property :end (org-element-at-point)))))
(length acc)))))
(should
(= 2
(org-test-with-temp-text "* H1\n** H1.1\n** H1.2\n"
(let (acc)
(org-map-entries
(lambda ()
(push (org-element-property :title (org-element-at-point)) acc)
(setq org-map-continue-from
(line-end-position 2))))
(length acc))))))
(ert-deftest test-org/edit-headline () (ert-deftest test-org/edit-headline ()
"Test `org-edit-headline' specifications." "Test `org-edit-headline' specifications."