From mboxrd@z Thu Jan 1 00:00:00 1970 From: Achim Gratz Subject: Re: Org release 8.2.5g (minor release from maint) Date: Sat, 25 Jan 2014 08:58:56 +0100 Message-ID: <87fvocbigv.fsf@Rainer.invalid> References: <87k3dtsat8.fsf@bzg.ath.cx> <87wqhtywkx.fsf@Rainer.invalid> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6y98-0002aO-Vf for emacs-orgmode@gnu.org; Sat, 25 Jan 2014 02:59:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W6y8z-000586-CI for emacs-orgmode@gnu.org; Sat, 25 Jan 2014 02:59:18 -0500 Received: from plane.gmane.org ([80.91.229.3]:42691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W6y8z-00057q-54 for emacs-orgmode@gnu.org; Sat, 25 Jan 2014 02:59:09 -0500 Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1W6y8x-0001Bw-Uj for emacs-orgmode@gnu.org; Sat, 25 Jan 2014 08:59:07 +0100 Received: from pd9eb1b5a.dip0.t-ipconnect.de ([217.235.27.90]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 25 Jan 2014 08:59:07 +0100 Received: from Stromeko by pd9eb1b5a.dip0.t-ipconnect.de with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 25 Jan 2014 08:59:07 +0100 List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Eric Schulte --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Achim Gratz writes: […] > in the second or the cdr of the second element of pre-info might > directly get the new value spliced in depending on whether the original > value is used someplace else. Splicing seems slightly more elegant than list construction, but pre-info needs to be preserved. Eric, please review the attached patch, I'm not certain about the current test coverage in that area. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-ob-lob-do-not-use-cl-at-runtime.patch >From 024e05c4de3c7598448ee97b0f986562007d5186 Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sat, 25 Jan 2014 08:53:33 +0100 Subject: [PATCH] ob-lob: do not use cl at runtime * lisp/ob-lob.el (org-babel-lob-execute): Do not use defun subseq from cl at runtime. Replace concatenation of sub-sequences by splicing the modified params list into a copy of info (pre-must info be preserved). --- lisp/ob-lob.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lisp/ob-lob.el b/lisp/ob-lob.el index c93198a..6480468 100644 --- a/lisp/ob-lob.el +++ b/lisp/ob-lob.el @@ -147,13 +147,14 @@ (defun org-babel-lob-execute (info) ;; Do *not* pre-process params for call line ;; hash evaluation, since for a call line :var ;; extension *is* execution. - (let ((params (nth 2 pre-info))) - (append (subseq pre-info 0 2) - (list - (cons - (cons :c-var (cdr (assoc :var params))) - (assq-delete-all :var (copy-tree params)))) - (subseq pre-info 3)))))) + (let* ((params (nth 2 pre-info)) + (sha1-nth2 (list + (cons + (cons :c-var (cdr (assoc :var params))) + (assq-delete-all :var (copy-tree params))))) + (sha1-info (copy-tree pre-info))) + (prog1 sha1-info + (setcar (cddr sha1-info) sha1-nth2)))))) (old-hash (when cache-p (org-babel-current-result-hash pre-info))) (org-babel-current-src-block-location (point-marker))) (if (and cache-p (equal new-hash old-hash)) -- 1.8.5.2 --=-=-= Content-Type: text/plain Regards, Achim. -- +<[Q+ Matrix-12 WAVE#46+305 Neuron microQkb Andromeda XTk Blofeld]>+ SD adaptations for KORG EX-800 and Poly-800MkII V0.9: http://Synth.Stromeko.net/Downloads.html#KorgSDada --=-=-=--