From 752a59c58f2b841cc46c7f470dffc39313022179 Mon Sep 17 00:00:00 2001 From: Eric Schulte Date: Thu, 17 Jun 2010 10:08:31 -0700 Subject: [PATCH] babel: ensure no whitespace in language names * lisp/babel/ob.el (org-babel-src-block-regexp): ensure no whitespace in language names (org-babel-inline-src-block-regexp): ensure no whitespace in language names --- lisp/babel/ob.el | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/babel/ob.el b/lisp/babel/ob.el index 27886bfa8..8664187f3 100644 --- a/lisp/babel/ob.el +++ b/lisp/babel/ob.el @@ -53,23 +53,23 @@ (defvar org-babel-src-block-regexp (concat - ;; (1) indentation (2) lang - "^\\([ \t]*\\)#\\+begin_src[ \t]+\\([^ \t]+\\)[ \t]*" - ;; (3) switches + ;; (1) indentation (2) lang + "^\\([ \t]*\\)#\\+begin_src[ \t]+\\([^ \f\t\n\r\v]+\\)[ \t]*" + ;; (3) switches "\\([^\":\n]*\"[^\"\n*]*\"[^\":\n]*\\|[^\":\n]*\\)" - ;; (4) header arguments + ;; (4) header arguments "\\([^\n]*\\)\n" - ;; (5) body + ;; (5) body "\\([^\000]+?\n\\)[ \t]*#\\+end_src") "Regexp used to identify code blocks.") (defvar org-babel-inline-src-block-regexp (concat - ;; (1) replacement target (2) lang - "[ \f\t\n\r\v]\\(src_\\([^ \t]+\\)" + ;; (1) replacement target (2) lang + "[ \f\t\n\r\v]\\(src_\\([^ \f\t\n\r\v]+\\)" ;; (3,4) (unused, headers) "\\(\\|\\[\\(.*?\\)\\]\\)" - ;; (5) body + ;; (5) body "{\\([^\f\n\r\v]+?\\)}\\)") "Regexp used to identify inline src-blocks.") -- 2.11.4.GIT