summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2015-09-01 21:34:06 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2015-09-01 21:34:06 +0200
commit258966a15d29773291cef40a05c14cfc59a25499 (patch)
treeac6c35d4b9f3be63d1f0bdb6b6979f0aa6480909
parent410ea62fc86ff8a2afc0183eba430b4de79df231 (diff)
parent7c49b7a66cff994454ee5b92f0d0c7444580c002 (diff)
downloadorg-mode-258966a15d29773291cef40a05c14cfc59a25499.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-element.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/org-element.el b/lisp/org-element.el
index c6508fd..06eab04 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4874,6 +4874,7 @@ This function assumes `org-element--cache' is a valid AVL tree."
(defsubst org-element--cache-active-p ()
"Non-nil when cache is active in current buffer."
(and org-element-use-cache
+ org-element--cache
(or (derived-mode-p 'org-mode) orgstruct-mode)))
(defun org-element--cache-find (pos &optional side)
@@ -5586,7 +5587,8 @@ buffers."
(interactive "P")
(dolist (buffer (if all (buffer-list) (list (current-buffer))))
(with-current-buffer buffer
- (when (org-element--cache-active-p)
+ (when (and org-element-use-cache
+ (or (derived-mode-p 'org-mode) orgstruct-mode))
(org-set-local 'org-element--cache
(avl-tree-create #'org-element--cache-compare))
(org-set-local 'org-element--cache-objects (make-hash-table :test #'eq))