From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 4OSsARHF2V/uIQAA0tVLHw (envelope-from ) for ; Wed, 16 Dec 2020 08:28:01 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 4BERORDF2V+4MgAAbx9fmQ (envelope-from ) for ; Wed, 16 Dec 2020 08:28:00 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 955689402B5 for ; Wed, 16 Dec 2020 08:28:00 +0000 (UTC) Received: from localhost ([::1]:52904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpSAB-0008HA-FC for larch@yhetil.org; Wed, 16 Dec 2020 03:27:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpS9P-0007pz-D4 for emacs-orgmode@gnu.org; Wed, 16 Dec 2020 03:27:11 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:37790) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpS9J-00018g-BC for emacs-orgmode@gnu.org; Wed, 16 Dec 2020 03:27:10 -0500 Received: by mail-pj1-x1031.google.com with SMTP id b5so1174839pjk.2 for ; Wed, 16 Dec 2020 00:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=HMdqCPoOiYaK5jN5h7InP7r0ZeIRnb21le+4opsvjBc=; b=jKDkgkz8BI824r+TtkQN3ZpAHGkl18GwSmoJ02zxfZ9jTL0e4s/m7C8CnF96a9IcCe ObeitPc8Z/rRq5YfTDOs75m+VbgSCi6OoUbbd5+nzO8U3Ke+LF25jzLQ90d8Mnh67fgb rnr+cBW+rqFPTXeDuDAxD7YwL0ZdwyUMVWnm8VKzAyiwarct7CIUMnzLPSSe1rphBpHu jFdWeO0U16F2V+pjV+ZLbbC/nBp2pLpiDubReYBn06n8MxgTneg0cpcTynM1hBlmsJbn kAWBsUSvRZV4EU9GuzcW8TQhT+alufUJZQuZ5O8ClEn27abwa9F4RMF9zxaTKu2YobQe 2Myw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=HMdqCPoOiYaK5jN5h7InP7r0ZeIRnb21le+4opsvjBc=; b=ERDR+aRwB1yNEaUpEG/rarH9JFu11OYK/F9K6QxF1gxskuWNQP9LCCXiSZrH5Vcvj1 8IVcSXMmLmP6q2aPH7oWSC37YXKJOykykuOcr6/i4OvwblUZSFOjJB1fx35NdmUzXzFX 3tRRY03G/r8GX8DeTnLob00dQ73O58aXoeUxJNf0d8vSNfYPitvY1fYlc4DcJumIbic2 8+5beaoipRIT1kDCNt1PWywoOm0c61NPNiUCs9hCkkNjkXkGHQJthQQCOO2Ur4poijXz WGG+XxsS5cAFaCUUTToEkZDZjZJ+S5qP33hL0Iu6Ql+1vlFeOAyMCPP2wPMlo5qrS57n Z9Jw== X-Gm-Message-State: AOAM530/juDyIm/9YMinOgeczCq9nhDtUgfEYNJEJhl+C+SHSDGZpims /tVTnpJIXh0CW+q6IEpzqqRUC25lNHWh/g== X-Google-Smtp-Source: ABdhPJykqC+8a0bX1hZGHbvPQQaHUSDxf17Y3QGjaqNeYTA1O6UrbfV+tZpxQQMRPetY+P9+6V0sHA== X-Received: by 2002:a17:902:e901:b029:db:c0d6:62cc with SMTP id k1-20020a170902e901b02900dbc0d662ccmr30581783pld.7.1608107218592; Wed, 16 Dec 2020 00:26:58 -0800 (PST) Received: from localhost ([172.121.189.110]) by smtp.gmail.com with ESMTPSA id y1sm1623316pff.17.2020.12.16.00.26.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 00:26:57 -0800 (PST) From: Ihor Radchenko To: emacs-orgmode@gnu.org Subject: [PATCH] ob-gnuplot: Fix error on non-string :var assignment X-Woof-Patch: t Date: Wed, 16 Dec 2020 16:30:48 +0800 Message-ID: <87o8iujgp3.fsf@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=yantar92@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -2.51 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=jKDkgkz8; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 955689402B5 X-Spam-Score: -2.51 X-Migadu-Scanner: scn0.migadu.com X-TUID: eB+0bxXHu3+v --=-=-= Content-Type: text/plain The following gnuplot code stopped working after recent commits adding support of remote files: #+CALL: stress-strain[:file stress-displ-RD-11.png](A=0.87, alpha=38.0, beta=7.0, inp="p11 DC.txt", tbl="stress-displ-RD-11.txt") Note that the code assigns several numerical variables. ob-gnuplot from master throws error when checking (file-remote-p ...). The fix is attached. Best, Ihor --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-ob-gnuplot-Fix-error-on-non-string-var-assignment.patch >From 8840afe1446177e5355e190fcaf6ce79d00ac0c6 Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Wed, 16 Dec 2020 16:23:41 +0800 Subject: [PATCH] ob-gnuplot: Fix error on non-string :var assignment * lisp/ob-gnuplot.el (org-babel-gnuplot-process-vars): Consider that not all the variable values must be a string in :var assignments. --- lisp/ob-gnuplot.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index d0cedb7a3..708ac97e4 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -94,7 +94,8 @@ code." (tablep (or (listp first) (symbolp first)))) (if tablep val (mapcar 'list val))) (org-babel-temp-file "gnuplot-") params) - (if (and (file-remote-p val) ;; check if val is a remote file + (if (and (stringp val) + (file-remote-p val) ;; check if val is a remote file (file-exists-p val)) ;; call to file-exists-p is slow, maybe remove it (let* ((local-name (concat ;; create a unique filename to avoid multiple downloads org-babel-temporary-directory -- 2.26.2 --=-=-=--