summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-02-01 01:09:00 +0100
committerBastien Guerry <bzg@altern.org>2014-02-01 01:09:00 +0100
commit4df24f5fc8138901cd00fde0ae6bdc2a91ab298c (patch)
tree7fc88b275583a750a4ed6c45779421c4e334e1bc
parentca0c77033d729a51688eabbb9847249cf50ad6c4 (diff)
parentccc4f6b96e6af91a5a1e7a5e6766eed9006d658b (diff)
downloadorg-mode-4df24f5fc8138901cd00fde0ae6bdc2a91ab298c.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org.el9
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/org.el b/lisp/org.el
index 20dcb92..d04122d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20378,12 +20378,9 @@ This command does many different things, depending on context:
((bold code entity export-snippet inline-babel-call inline-src-block
italic latex-fragment line-break macro strike-through subscript
superscript underline verbatim)
- (while (and (not (memq (setq type (org-element-type context))
- '(paragraph verse-block)))
- (org-element-property
- :parent
- (org-element-property :parent context)))
- (setq context (org-element-property :parent context)))))
+ (while (and (setq context (org-element-property :parent context))
+ (not (memq (setq type (org-element-type context))
+ '(paragraph verse-block table-cell)))))))
;; For convenience: at the first line of a paragraph on the
;; same line as an item, apply function on that item instead.
(when (eq type 'paragraph)