Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode
This commit is contained in:
commit
6846edeba3
|
@ -57,10 +57,11 @@ called by `org-babel-execute-src-block'."
|
|||
(let ((result-params (split-string (or (cdr (assoc :results params)) "")))
|
||||
(out-file (cdr (assoc :file params)))
|
||||
(cmdline (cdr (assoc :cmdline params)))
|
||||
(cmd (or (cdr (assoc :cmd params)) "dot"))
|
||||
(in-file (make-temp-file "org-babel-dot")))
|
||||
(with-temp-file in-file (insert body))
|
||||
(message (concat "dot " in-file " " cmdline " -o " out-file))
|
||||
(shell-command (concat "dot " in-file " " cmdline " -o " out-file))
|
||||
(message (concat cmd " " in-file " " cmdline " -o " out-file))
|
||||
(shell-command (concat cmd " " in-file " " cmdline " -o " out-file))
|
||||
out-file))
|
||||
|
||||
(defun org-babel-prep-session:dot (session params)
|
||||
|
|
|
@ -122,7 +122,7 @@ but which mess up the display of a snippet in Org exported files.")
|
|||
|
||||
(defcustom org-src-lang-modes
|
||||
'(("ocaml" . tuareg) ("elisp" . emacs-lisp) ("ditaa" . artist)
|
||||
("asymptote" . asy))
|
||||
("asymptote" . asy) ("dot" . fundamental))
|
||||
"Alist mapping languages to their major mode.
|
||||
The key is the language name, the value is the string that should
|
||||
be inserted as the name of the major mode. For many languages this is
|
||||
|
|
Loading…
Reference in New Issue