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

org-element: Fix cache corruption when altering a drawer 

* lisp/org-element.el (org-element--cache-submit-request): Correctly
  update cache when changes alter the contents of a greater
  element (e.g. a property drawer).

Thanks to Alan Schmitt for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/88086
This commit is contained in:
Nicolas Goaziou 2014-06-28 00:28:45 +02:00
parent 2ae77c5e50
commit 2824502e2e
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/org-element.el
View File

@ -5494,11 +5494,20 @@ change, as an integer."
(progn
(incf (aref next 2) offset)
(incf (aref next 3) offset)
(when (> (aref next 1) beg)
(let ((first (org-element--cache-for-removal beg end offset)))
(when first
(aset next 0 (org-element--cache-key first))
(aset next 1 (org-element-property :begin first))))))
;; If last changes happened before old ones, we need to
;; recompute the key of the first element to remove.
;; Otherwise, we need to extend boundaries of robust parents
;; (see `org-element--cache-for-removal'), if any.
(let ((first-beg (aref next 1)))
(if (> first-beg beg)
(let ((first (org-element--cache-for-removal beg end offset)))
(when first
(aset next 0 (org-element--cache-key first))
(aset next 1 (org-element-property :begin first))))
(let ((up (org-element--cache-find first-beg)))
(while (setq up (org-element-property :parent up))
(org-element--cache-shift-positions
up offset '(:contents-end :end)))))))
;; Ensure cache is correct up to END. Also make sure that NEXT,
;; if any, is no longer a 0-phase request, thus ensuring that
;; phases are properly ordered. We need to provide OFFSET as