From 40cb44e79517e85799f6f05c550bc83d55c971ee Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 24 Dec 2012 01:25:33 +0100 Subject: [PATCH] Fix regression: allow editing HTML and LaTeX source blocks again * org.el (org-table-map-tables): Fix allowed blocks. (org-edit-special): Fix regression: allow editing HTML and LaTeX source blocks again. * org-src.el (org-edit-src-code): Ditto. Thanks to Nicolas Richard and Bernt Hansen for reporting bugs in this area. --- lisp/org-src.el | 2 +- lisp/org.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org-src.el b/lisp/org-src.el index e55675a13..db3552704 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -210,7 +210,7 @@ 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"))) + (if (not (org-in-block-p '("src" "example" "latex" "html"))) (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))) diff --git a/lisp/org.el b/lisp/org.el index 446c04a36..0fabaf600 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -3952,7 +3952,7 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables." (beginning-of-line 1) (when (and (looking-at org-table-line-regexp) ;; Exclude tables in src/example/verbatim/clocktable blocks - (not (org-in-block-p '("src" "example")))) + (not (org-in-block-p '("src" "example" "verbatim" "clocktable")))) (save-excursion (funcall function)) (or (looking-at org-table-line-regexp) (forward-char 1))) @@ -18996,7 +18996,7 @@ Otherwise, return a user error." (beginning-of-line 1) (let ((case-fold-search )) (looking-at "[ \t]*#\\+tblfm:")))) (call-interactively 'org-table-edit-formulas)) - ((or (org-in-block-p '("src" "example")) + ((or (org-in-block-p '("src" "example" "latex" "html")) (org-at-table.el-p)) (org-edit-src-code)) ((org-in-fixed-width-region-p) (org-edit-fixed-width-region))