mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-07 15:22:06 +00:00
Code

org-fold-save-outline-visibility: Make it work with 'text-properties

Browse Source 
*
lisp/org-fold.el (org-fold-save-outline-visibility--text-properties):
Do not expand list of specs on compile time.  Simplify saving and
re-applying folds.

* lisp/org-fold.el (org-fold-save-outline-visibility): Fix typo when
-> if.
This commit is contained in:
Ihor Radchenko 2022-05-03 14:25:17 +08:00
parent 5d3173cb04
commit ebbef7b30c
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lisp/org-fold.el
View File

@ -298,27 +298,28 @@ means that the buffer should stay alive during the operation,
because otherwise all these markers will point to nowhere."
(declare (debug (form body)) (indent 1))
(org-with-gensyms (data specs markers?)
`(let* ((,specs ',(org-fold-core-folding-spec-list))
`(let* ((,specs (org-fold-core-folding-spec-list))
(,markers? ,use-markers)
(,data
(org-with-wide-buffer
(let ((pos (point-min))
data-val)
(while (< pos (point-max))
(dolist (spec (org-fold-get-folding-spec 'all pos))
(let ((region (org-fold-get-region-at-point spec pos)))
(if ,markers?
(push (list (copy-marker (car region))
(copy-marker (cdr region) t)
spec)
data-val)
(push (list (car region) (cdr region) spec)
data-val))))
(setq pos (org-fold-next-folding-state-change nil pos)))))))
(let (data-val)
(dolist (spec ,specs)
(let ((pos (point-min)))
(while (< pos (point-max))
(when (org-fold-get-folding-spec spec pos)
(let ((region (org-fold-get-region-at-point spec pos)))
(if ,markers?
(push (list (copy-marker (car region))
(copy-marker (cdr region) t)
spec)
data-val)
(push (list (car region) (cdr region) spec)
data-val))))
(setq pos (org-fold-next-folding-state-change spec pos)))))
data-val))))
(unwind-protect (progn ,@body)
(org-with-wide-buffer
(dolist (spec ,specs)
(org-fold-region (point-min) (point-max) nil spec))
(org-fold-region (point-min) (point-max) nil)
(pcase-dolist (`(,beg ,end ,spec) (delq nil ,data))
(org-fold-region beg end t spec)
(when ,markers?
@ -331,8 +332,8 @@ means that the buffer may change while running BODY, but it also
means that the buffer should stay alive during the operation,
because otherwise all these markers will point to nowhere."
(declare (debug (form body)) (indent 1))
`(when (eq org-fold-core-style 'text-properties)
(org-fold-save-outline-visibility--text-properties ,use-markers ,@body)
`(if (eq org-fold-core-style 'text-properties)
(org-fold-save-outline-visibility--text-properties ,use-markers ,@body)
(org-fold-save-outline-visibility--overlays ,use-markers ,@body)))
;;;; Changing visibility (regions, blocks, drawers, headlines)