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

Remove `org-hide-block-overlays' variable 

* lisp/org.el (org-hide-block-overlays): Remove variable.
(org-show-block-all): Use `remove-overlays' to remove block-related
overlays instead of relying on a global state.
(org-hide-block-toggle): Do not update removed variable.  Tiny
refactoring.
This commit is contained in:
Nicolas Goaziou 2016-10-17 23:22:19 +02:00
parent 728920a8ed
commit bbf1c26aaf
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/org.el
View File

@ -7223,9 +7223,6 @@ DATA should have been made by `org-outline-overlay-data'."
;;; Folding of blocks ;;; Folding of blocks
(defvar-local org-hide-block-overlays nil
"Overlays hiding blocks.")
(defun org-block-map (function &optional start end) (defun org-block-map (function &optional start end)
"Call FUNCTION at the head of all source blocks in the current buffer. "Call FUNCTION at the head of all source blocks in the current buffer.
Optional arguments START and END can be used to limit the range." Optional arguments START and END can be used to limit the range."
@ -7252,8 +7249,7 @@ Optional arguments START and END can be used to limit the range."
(defun org-show-block-all () (defun org-show-block-all ()
"Unfold all blocks in the current buffer." "Unfold all blocks in the current buffer."
(interactive) (interactive)
(mapc #'delete-overlay org-hide-block-overlays) (remove-overlays nil nil 'invisible 'org-hide-block))
(setq org-hide-block-overlays nil))
(defun org-hide-block-toggle-maybe () (defun org-hide-block-toggle-maybe ()
"Toggle visibility of block at point. "Toggle visibility of block at point.
@ -7294,14 +7290,7 @@ a block. Return a non-nil value when toggling is successful."
(let ((ov (make-overlay start end))) (let ((ov (make-overlay start end)))
(overlay-put ov 'invisible 'org-hide-block) (overlay-put ov 'invisible 'org-hide-block)
;; Make the block accessible to `isearch'. ;; Make the block accessible to `isearch'.
(overlay-put (overlay-put ov 'isearch-open-invisible #'delete-overlay)
ov 'isearch-open-invisible
(lambda (ov)
(when (memq ov org-hide-block-overlays)
(setq org-hide-block-overlays (delq ov org-hide-block-overlays)))
(when (eq (overlay-get ov 'invisible) 'org-hide-block)
(delete-overlay ov))))
(push ov org-hide-block-overlays)
;; When the block is hidden away, make sure point is left in ;; When the block is hidden away, make sure point is left in
;; a visible part of the buffer. ;; a visible part of the buffer.
(when (> (line-beginning-position) start) (when (> (line-beginning-position) start)
@ -7311,8 +7300,6 @@ a block. Return a non-nil value when toggling is successful."
t)) t))
((or (not force) (eq force 'off)) ((or (not force) (eq force 'off))
(dolist (ov overlays t) (dolist (ov overlays t)
(when (memq ov org-hide-block-overlays)
(setq org-hide-block-overlays (delq ov org-hide-block-overlays)))
(when (eq (overlay-get ov 'invisible) 'org-hide-block) (when (eq (overlay-get ov 'invisible) 'org-hide-block)
(delete-overlay ov)))))))) (delete-overlay ov))))))))