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-16 12:30:03 +03:00
parent 25dd206a0e df4a5d86d8
commit 889b8cc2fd
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lisp/org-fold-core.el
View File

@ -1003,7 +1003,13 @@ If SPEC-OR-ALIAS is omitted and FLAG is nil, unfold everything in the region."
(overlay-put o (org-fold-core--property-symbol-get-create spec) spec) (overlay-put o (org-fold-core--property-symbol-get-create spec) spec)
(overlay-put o 'invisible spec) (overlay-put o 'invisible spec)
(overlay-put o 'isearch-open-invisible #'org-fold-core--isearch-show) (overlay-put o 'isearch-open-invisible #'org-fold-core--isearch-show)
(overlay-put o 'isearch-open-invisible-temporary #'org-fold-core--isearch-show-temporary)) ;; FIXME: Disabling to work around Emacs bug#60399
;; and https://orgmode.org/list/87zgb6tk6h.fsf@localhost.
;; The proper fix will require making sure that
;; `org-fold-core-isearch-open-function' does not
;; delete the overlays used by isearch.
;; (overlay-put o 'isearch-open-invisible-temporary #'org-fold-core--isearch-show-temporary)
)
(put-text-property from to (org-fold-core--property-symbol-get-create spec) spec) (put-text-property from to (org-fold-core--property-symbol-get-create spec) spec)
(put-text-property from to 'isearch-open-invisible #'org-fold-core--isearch-show) (put-text-property from to 'isearch-open-invisible #'org-fold-core--isearch-show)
(put-text-property from to 'isearch-open-invisible-temporary #'org-fold-core--isearch-show-temporary) (put-text-property from to 'isearch-open-invisible-temporary #'org-fold-core--isearch-show-temporary)
@ -1131,16 +1137,9 @@ This function is intended to be used as `isearch-filter-predicate'."
"Clear `org-fold-core--isearch-local-regions'." "Clear `org-fold-core--isearch-local-regions'."
(clrhash org-fold-core--isearch-local-regions)) (clrhash org-fold-core--isearch-local-regions))
(defun org-fold-core--isearch-show (region) (defun org-fold-core--isearch-show (_)
"Reveal text in REGION found by isearch. "Reveal text at point found by isearch."
REGION can also be an overlay in current buffer." (funcall org-fold-core-isearch-open-function (point)))
(when (overlayp region)
(setq region (cons (overlay-start region)
(overlay-end region))))
(let ((pos (car region)))
(while (< pos (cdr region))
(funcall org-fold-core-isearch-open-function (car region))
(setq pos (org-fold-core-next-visibility-change pos (cdr region) 'ignore-hidden)))))
(defun org-fold-core--isearch-show-temporary (region hide-p) (defun org-fold-core--isearch-show-temporary (region hide-p)
"Temporarily reveal text in REGION. "Temporarily reveal text in REGION.