[elpa] externals/org d5a52be0a5: org-fold-core: Remove `org-fold-core-first-unfold-functions'

[ELPA Syncer]

branch: externals/org
commit d5a52be0a50bf9936c7e0b596dd964860e817265
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    org-fold-core: Remove `org-fold-core-first-unfold-functions'
    
    * lisp/org-fold-core.el (org-fold-core-first-unfold-functions):
    Remove.  This is very too tricky to implement.  In particular, when we
    use jit-lock, there can be a race between calls to
    `org-fold-core-region' and fontification.  For example, consider that
    one of the functions in the hook folds drawers and everything is
    folded initially.  Then, if the user requests unfolding headlines,
    drawers, and blocks, it happens before jit-lock is ran in invisible
    parts of buffer (out of the display).  Those parts will be folded
    despite user explicitly requested full unfold, which is wrong.  Fixing
    this behaviour would involve implementing a full-fledged tracker on
    top of jit-lock, which is very too complex and will likely introduce
    hard-to-debug errors.
    
    * lisp/org-fold-core.el (org-fold-core-initialize):
    (org-fold-core-region):
    (org-fold-core-remove-optimisation):
    * lisp/org-cycle.el (org-cycle-hide-drawers):
    (org-cycle-hide-archived-subtrees): Do not use
    `org-fold-core-first-unfold-functions'.
    
    Fixes https://list.orgmode.org/80k0ar1lml.fsf@felesatra.moe/T/#u
---
 lisp/org-cycle.el     | 11 ++---------
 lisp/org-fold-core.el | 28 +++-------------------------
 2 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index df0a3761a1..70a082a46a 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -239,12 +239,7 @@ STATE should be one of the symbols listed in the docstring 
of
                   (end (cond (global? (point-max))
                              ((eq state 'children) (org-entry-end-position))
                              (t (save-excursion (org-end-of-subtree t t))))))
-             (if (not global?)
-                 (org-fold--hide-drawers beg end)
-               ;; Delay folding drawers inside folded subtrees until
-               ;; first unfold.
-               (add-hook 'org-fold-core-first-unfold-functions
-                         #'org-fold--hide-drawers))))
+             (org-fold--hide-drawers beg end)))
           ((memq state '(overview contents))
            ;; Hide drawers before first heading.
            (let ((beg (point-min))
@@ -799,9 +794,7 @@ STATE should be one of the symbols listed in the docstring 
of
              (not (memq state '(overview folded))))
     (let ((globalp (memq state '(contents all))))
       (if globalp
-          ;; Delay hiding inside folded subtrees until first unfold.
-          (add-hook 'org-fold-core-first-unfold-functions
-                    #'org-fold-hide-archived-subtrees)
+          (org-fold-hide-archived-subtrees (point-min) (point-max))
         (org-fold-hide-archived-subtrees
          (point)
          (save-excursion
diff --git a/lisp/org-fold-core.el b/lisp/org-fold-core.el
index dae3426173..6165338393 100644
--- a/lisp/org-fold-core.el
+++ b/lisp/org-fold-core.el
@@ -305,14 +305,6 @@ less error-prone."
           (const :tag "Overlays" 'overlays)
           (const :tag "Text properties" 'text-properties)))
 
-(defcustom org-fold-core-first-unfold-functions nil
-  "Functions executed after first unfolding during fontification.
-Each function is exectured with two arguments: begin and end points of
-the unfolded region."
-  :group 'org
-  :package-version '(Org . "9.6")
-  :type 'hook)
-
 (defvar-local org-fold-core-isearch-open-function 
#'org-fold-core--isearch-reveal
   "Function used to reveal hidden text found by isearch.
 The function is called with a single argument - point where text is to
@@ -746,8 +738,7 @@ future org buffers."
   (add-hook 'clone-indirect-buffer-hook 
#'org-fold-core-decouple-indirect-buffer-folds nil 'local)
   ;; Optimise buffer fontification to not fontify folded text.
   (when (eq font-lock-fontify-region-function 
#'font-lock-default-fontify-region)
-    (setq-local font-lock-fontify-region-function 
'org-fold-core-fontify-region)
-    (add-to-list 'font-lock-extra-managed-props 'org-fold-core-fontified))
+    (setq-local font-lock-fontify-region-function 
'org-fold-core-fontify-region))
   ;; Setup killing text
   (setq-local filter-buffer-substring-function 
#'org-fold-core--buffer-substring-filter)
   (if (and (boundp 'isearch-opened-regions)
@@ -1001,8 +992,7 @@ If SPEC-OR-ALIAS is omitted and FLAG is nil, unfold 
everything in the region."
            ;; Fontify unfolded text.
            (unless (or (not font-lock-mode)
                        org-fold-core--fontifying
-                       (not (org-fold-core-get-folding-spec-property spec 
:font-lock-skip))
-                       (not (text-property-not-all from to 
'org-fold-core-fontified t)))
+                       (not (org-fold-core-get-folding-spec-property spec 
:font-lock-skip)))
              (let ((org-fold-core--fontifying t))
                (if jit-lock-mode
                    (jit-lock-refontify from to)
@@ -1482,19 +1472,7 @@ folded regions.")
                       `(jit-lock-bounds
                         ,(min oldbeg beg)
                         ,(max oldend end))))
-               (value (setq font-lock-return-value value)))))
-          (save-match-data
-            ;; Only run within regions that are not yet touched by
-            ;; fontification.
-            (let ((r next) (c pos) nxt)
-              (when (get-text-property c 'org-fold-core-fontified)
-                (setq c (next-single-property-change c 
'org-fold-core-fontified)))
-              (setq nxt (next-single-property-change c 
'org-fold-core-fontified nil r))
-              (while (< c r)
-                (run-hook-with-args 'org-fold-core-first-unfold-functions c 
nxt)
-                (setq c (next-single-property-change nxt 
'org-fold-core-fontified nil r))
-                (setq nxt (next-single-property-change c 
'org-fold-core-fontified nil r))))))
-        (put-text-property pos next 'org-fold-core-fontified t)
+               (value (setq font-lock-return-value value))))))
         (put-text-property pos next 'fontified t)
         (setq pos next))
       (or font-lock-return-value `(jit-lock-bounds ,beg . ,end)))))