From b68122821a26578470506938c3a358f52f5d7a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Le=20Gouguec?= Date: Thu, 28 May 2020 11:09:18 +0200 Subject: [PATCH 1/2] Coerce symbols found in :includes header arguments to strings Fix regression from 2020-05-24T16:23:26Z!brandon@guttersohn.org (commit 44cb98fdb), which broke test ob-C/string-var. * lisp/ob-C.el (org-babel-C-expand-C): Make sure items in :includes arguments are strings before performing string operations on them. --- lisp/ob-C.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lisp/ob-C.el b/lisp/ob-C.el index c3e72c680..42c60c296 100644 --- a/lisp/ob-C.el +++ b/lisp/ob-C.el @@ -233,6 +233,9 @@ its header arguments." ;; includes (mapconcat (lambda (inc) + ;; :includes '( ) gives us a list of + ;; symbols; convert those to strings. + (when (symbolp inc) (setq inc (symbol-name inc))) (if (string-prefix-p "<" inc) (format "#include %s" inc) (format "#include \"%s\"" inc))) -- 2.17.1