summaryrefslogtreecommitdiff
path: root/lisp/org/org-src.el
diff options
context:
space:
mode:
authorBastien Guerry <bzg@gnu.org>2013-01-08 16:31:30 +0100
committerBastien Guerry <bzg@gnu.org>2013-01-08 16:31:30 +0100
commit6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb (patch)
treef9115fbdc6e42a73b57e20a27334057b80275814 /lisp/org/org-src.el
parentc7cf0ebc24d66371c8d48ad72f65e72a2a027f06 (diff)
downloademacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.tar.gz
Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.
Diffstat (limited to 'lisp/org/org-src.el')
-rw-r--r--lisp/org/org-src.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org/org-src.el b/lisp/org/org-src.el
index 221ae367c87..277196bb768 100644
--- a/lisp/org/org-src.el
+++ b/lisp/org/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)))