Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2014-09-12 21:40:17 +02:00
commit 2bd8370d06
1 changed files with 3 additions and 2 deletions

View File

@ -7339,8 +7339,9 @@ is non-nil, hide it unconditionally."
(interactive) (interactive)
(let ((element (org-element-at-point))) (let ((element (org-element-at-point)))
(unless (memq (org-element-type element) (unless (memq (org-element-type element)
'(center-block comment-block example-block quote-block '(center-block comment-block example-block export-block
special-block src-block verse-block)) quote-block special-block src-block
verse-block))
(user-error "Not at a block")) (user-error "Not at a block"))
(let* ((start (save-excursion (let* ((start (save-excursion
(goto-char (org-element-property :post-affiliated element)) (goto-char (org-element-property :post-affiliated element))