diff options
author | Bastien Guerry <bzg@altern.org> | 2014-01-31 15:53:54 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2014-01-31 15:53:54 +0100 |
commit | bdeac998c846988e111d857d2e3252cb5173ecf5 (patch) | |
tree | 4c2a190b8d42f213f1f385fe3570d0cc2d59d28e | |
parent | 21ce3296b7fb582617e7bf5689224be9c429f9b0 (diff) | |
parent | d035a9af6c77deacb102406feb5450fed78a7c25 (diff) | |
download | org-mode-bdeac998c846988e111d857d2e3252cb5173ecf5.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lisp/org.el b/lisp/org.el index 9e6c764..20dcb92 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20378,9 +20378,12 @@ 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 (setq context (org-element-property :parent context)) - (not (memq (setq type (org-element-type context)) - '(paragraph verse-block))))))) + (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))))) ;; 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) |