diff options
| author | Bastien <bzg@gnu.org> | 2019-12-03 23:27:04 +0100 |
|---|---|---|
| committer | Bastien <bzg@gnu.org> | 2019-12-03 23:27:04 +0100 |
| commit | 165f7383822086d465519ebe6e4283723923f097 (patch) | |
| tree | 820be9480e3d571d766483f564c963037192f6ec /lisp/org/ob-ocaml.el | |
| parent | 821de968434d2096bdea67dd24301bf6b517aef1 (diff) | |
| download | emacs-165f7383822086d465519ebe6e4283723923f097.tar.gz | |
Update Org to 9.3
Diffstat (limited to 'lisp/org/ob-ocaml.el')
| -rw-r--r-- | lisp/org/ob-ocaml.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/org/ob-ocaml.el b/lisp/org/ob-ocaml.el index e8f801b992f..54bc49a2ff9 100644 --- a/lisp/org/ob-ocaml.el +++ b/lisp/org/ob-ocaml.el @@ -37,11 +37,11 @@ ;;; Code: (require 'ob) (require 'comint) +(require 'org-macs) (declare-function tuareg-run-caml "ext:tuareg" ()) (declare-function tuareg-run-ocaml "ext:tuareg" ()) (declare-function tuareg-interactive-send-input "ext:tuareg" ()) -(declare-function org-trim "org" (s &optional keep-lead)) (defvar org-babel-tangle-lang-exts) (add-to-list 'org-babel-tangle-lang-exts '("ocaml" . "ml")) @@ -83,11 +83,11 @@ (raw (org-trim clean)) (result-params (cdr (assq :result-params params)))) (string-match - "\\(\\(.*\n\\)*\\)[^:\n]+ : \\([^=\n]+\\) =\\(\n\\| \\)\\(.+\\)$" + "\\(\\(.*\n\\)*\\)[^:\n]+ : \\([^=\n]+\\) =[[:space:]]+\\(\\(.\\|\n\\)+\\)$" raw) (let ((output (match-string 1 raw)) (type (match-string 3 raw)) - (value (match-string 5 raw))) + (value (match-string 4 raw))) (org-babel-reassemble-table (org-babel-result-cond result-params (cond |