summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2013-01-08 14:57:17 (GMT)
committer Bastien Guerry <bzg@altern.org>2013-01-08 14:57:17 (GMT)
commitf5e478a401b846318dec9cee2b664a91d0d9a07d (patch)
tree7cdf368ff9d3b859d2d2bb327547832d07ada18e
parent679dce0fda64e566f6a4106ec11aa090cdbc28df (diff)
parenta4b41431327c89392066f76910fd3af8e8b5d13a (diff)
downloadorg-mode-f5e478a401b846318dec9cee2b664a91d0d9a07d.zip
org-mode-f5e478a401b846318dec9cee2b664a91d0d9a07d.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-src.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 221ae36..277196b 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -211,7 +211,8 @@ edited version. An optional argument CONTEXT is used by \\[org-edit-src-save]
when calling this function. See `org-src-window-setup' to configure
the display of windows containing the Org buffer and the code buffer."
(interactive)
- (if (not (org-in-block-p '("src" "example" "latex" "html")))
+ (if (not (or (org-in-block-p '("src" "example" "latex" "html"))
+ (org-at-table.el-p)))
(user-error "Not in a source code or example block")
(unless (eq context 'save)
(setq org-edit-src-saved-temp-window-config (current-window-configuration)))