From 6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 16:31:30 +0100 Subject: Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog. --- lisp/org/org-src.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/org/org-src.el') 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))) -- cgit v1.2.3