diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-08 18:33:09 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-08 18:33:09 +0100 |
commit | 7330e2a8a4485abcfaf86ba93c2520f46f3feafe (patch) | |
tree | 148b3c2c79d1f1446990a531e96491cb2c62abdb | |
parent | b4ff6d972764568ad33493ecb1b9a8951ea4b471 (diff) | |
parent | a5815f3f5b89d5b064af890f42fe09cb156c3959 (diff) | |
download | org-mode-7330e2a8a4485abcfaf86ba93c2520f46f3feafe.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-src.el | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lisp/org-src.el b/lisp/org-src.el index 277196b..501d30a 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -528,6 +528,14 @@ the language, a switch telling if the content should be in a single line." (pos (point)) re1 re2 single beg end lang lfmt match-re1 ind entry) (catch 'exit + (when (org-at-table.el-p) + (re-search-backward "^[\t]*[^ \t|\\+]" nil t) + (setq beg (1+ (point-at-eol))) + (goto-char beg) + (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) + (progn (goto-char (point-max)) (newline))) + (setq end (1- (point-at-bol))) + (throw 'exit (list beg end 'table.el nil nil 0))) (while (setq entry (pop re-list)) (setq re1 (car entry) re2 (nth 1 entry) lang (nth 2 entry) single (nth 3 entry)) @@ -558,16 +566,7 @@ the language, a switch telling if the content should be in a single line." (throw 'exit (list (match-end 0) end (org-edit-src-get-lang lang) - single lfmt ind))))))))) - (when (org-at-table.el-p) - (re-search-backward "^[\t]*[^ \t|\\+]" nil t) - (setq beg (1+ (point-at-eol))) - (goto-char beg) - (or (re-search-forward "^[\t]*[^ \t|\\+]" nil t) - (progn (goto-char (point-max)) (newline))) - (setq end (point-at-bol)) - (setq ind (org-edit-src-get-indentation beg)) - (throw 'exit (list beg end 'table.el nil nil ind)))))) + single lfmt ind)))))))))))) (defun org-edit-src-get-lang (lang) "Extract the src language." |