1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-21 06:55:35 +00:00

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2024-10-26 19:33:19 +02:00
commit 1c98731d50
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 8 additions and 7 deletions

View File

@ -4935,10 +4935,13 @@ When PARSE is non-nil, values from keywords belonging to
;; parts of the parse tree.
(defun org-element-parse-buffer (&optional granularity visible-only keep-deferred)
"Recursively parse the buffer and return structure.
"Recursively parse the current Org mode buffer and return structure.
If narrowing is in effect, only parse the visible part of the
buffer.
This function assumes that current major mode is `org-mode'. When the
major mode is different, the behaviour is undefined.
Optional argument GRANULARITY determines the depth of the
recursion. It can be set to the following symbols:
@ -4977,9 +4980,7 @@ pattern (TYPE PROPERTIES CONTENTS), where :
The Org buffer has `org-data' as type and nil as properties.
`org-element-map' function can be used to find specific elements
or objects within the parse tree.
This function assumes that current major mode is `org-mode'."
or objects within the parse tree."
(save-excursion
(goto-char (point-min))
(let ((org-data (org-element-org-data-parser))

View File

@ -21765,10 +21765,10 @@ When TO-HEADING is non-nil, go to the next heading or `point-max'."
"Skip planning line and properties drawer in current entry.
When optional argument FULL is t, also skip planning information,
clocking lines and any kind of drawer.
clocking lines, any kind of drawer, and blank lines
When FULL is non-nil but not t, skip planning information,
properties, clocking lines and logbook drawers."
properties, clocking lines, logbook drawers, and blank lines."
(org-back-to-heading t)
(forward-line)
;; Skip planning information.
@ -21783,7 +21783,7 @@ properties, clocking lines and logbook drawers."
(let ((end (save-excursion (outline-next-heading) (point)))
(re (concat "[ \t]*$" "\\|" org-clock-line-re)))
(while (not (eobp))
(cond ;; Skip clock lines.
(cond ;; Skip clock lines and blank lines.
((looking-at-p re) (forward-line))
;; Skip logbook drawer.
((looking-at-p org-logbook-drawer-re)