mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 22:07:49 +00:00
Merge branch 'maint'
This commit is contained in:
commit
9874458468
|
@ -125,7 +125,8 @@ or `org-babel-execute:C++' or `org-babel-execute:D'."
|
||||||
(pcase org-babel-c-variant
|
(pcase org-babel-c-variant
|
||||||
(`c ".c") (`cpp ".cpp") (`d ".d"))))
|
(`c ".c") (`cpp ".cpp") (`d ".d"))))
|
||||||
(tmp-bin-file ;not used for D
|
(tmp-bin-file ;not used for D
|
||||||
(org-babel-temp-file "C-bin-" org-babel-exeext))
|
(org-babel-process-file-name
|
||||||
|
(org-babel-temp-file "C-bin-" org-babel-exeext)))
|
||||||
(cmdline (cdr (assq :cmdline params)))
|
(cmdline (cdr (assq :cmdline params)))
|
||||||
(cmdline (if cmdline (concat " " cmdline) ""))
|
(cmdline (if cmdline (concat " " cmdline) ""))
|
||||||
(flags (cdr (assq :flags params)))
|
(flags (cdr (assq :flags params)))
|
||||||
|
@ -151,7 +152,7 @@ or `org-babel-execute:C++' or `org-babel-execute:D'."
|
||||||
(pcase org-babel-c-variant
|
(pcase org-babel-c-variant
|
||||||
(`c org-babel-C-compiler)
|
(`c org-babel-C-compiler)
|
||||||
(`cpp org-babel-C++-compiler))
|
(`cpp org-babel-C++-compiler))
|
||||||
(org-babel-process-file-name tmp-bin-file)
|
tmp-bin-file
|
||||||
flags
|
flags
|
||||||
(org-babel-process-file-name tmp-src-file)
|
(org-babel-process-file-name tmp-src-file)
|
||||||
libs)
|
libs)
|
||||||
|
|
Loading…
Reference in a new issue