From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 4EiWCepxsWCowQAAgWs5BA (envelope-from ) for ; Sat, 29 May 2021 00:42:50 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id IK7SBOpxsWCMOAAAB5/wlQ (envelope-from ) for ; Fri, 28 May 2021 22:42:50 +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 85F0B1933C for ; Sat, 29 May 2021 00:42:49 +0200 (CEST) Received: from localhost ([::1]:38700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lmlBm-0008MG-V6 for larch@yhetil.org; Fri, 28 May 2021 18:42:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37508) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lmlAw-0008Lt-1R for emacs-orgmode@gnu.org; Fri, 28 May 2021 18:41:54 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:34550) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lmlAu-0002kc-Fk for emacs-orgmode@gnu.org; Fri, 28 May 2021 18:41:53 -0400 Received: by mail-qv1-xf35.google.com with SMTP id o59so2715487qva.1 for ; Fri, 28 May 2021 15:41:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RIPhtdl/yB3RsMj7FPZmLuUE3L2iufQqxTt9kErCP8I=; b=Y4obP4kmaYlazKoyxUmCXWiZr57zufi9Cx02GmDxVgxvoETZVruM3U4BYqPBjLwP9G 4H7VuufOIkjDBrdE/EDgSGTjKYBST7F3PEhQf4s0B8LPTqtpNZdoYri/QDGr/2DdZlfU +bnQQx+1DWVq683NI3wf35WpAQMiSg7PLrqrW+jkYB97SAYk3yH2qeCag1VrsAdf+0S2 /lHfsFg4ywQSZhQAJM/R5BM90vWDn8k321NG2nS146Q6+osAlZHXaluF+TO3c9wpaV/K 4nzNOCgPr1eWK3Y3gLYr+CEH6J4cafGR4ulUNXKLVoKrnICisbMnyCtyOQQhR8pDdWHJ rrSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RIPhtdl/yB3RsMj7FPZmLuUE3L2iufQqxTt9kErCP8I=; b=Kwx9aj7SmLHw3S0oHPciTGRa//uEaeUN3qWtlgd1N8RN4yGkjJt8HpSrgRefvmWozo gypogcAaExprn2dUGIPUmUFA4UaZmxTJpP5V8xeTlux2OYimRcYt4UL62BGzp7Cz1Who E07Qp7QFVrAS197UxRcGzoNAXNoJVOfB7BEpeBCWy4PzOWenHAlSvKVq8W4H5sJC1Kg1 2NfKf8XAz8dmnyihW/ykKktjp9lIpLK6pzSEtLP8hNF32PP2v+B+JbpvoAHqjDyi39J1 Wo3TB0MoCr3/wZ8J+2zj4j8P2m2PsvH1A9QTau5FMlH6ZCrhaWXwfymtDFrWGsF8ZGcM ZaNw== X-Gm-Message-State: AOAM530RQhsbvf8aTLkDgRH77AGStSfDZYd18c7HjX6dJZNhtqhfinps q/w5gqnU5Lq18d5pEUscTmlH1flPsY0xcg== X-Google-Smtp-Source: ABdhPJw+MUtgA8xD73RpQFx4hsJIlEIy9ryv+S2HcYkseBQtTz1QRhw/LCdHxSCu0RLI4rfehTXuow== X-Received: by 2002:a0c:e791:: with SMTP id x17mr4366984qvn.45.1622241710319; Fri, 28 May 2021 15:41:50 -0700 (PDT) Received: from localhost.localdomain (cpe-24-74-69-118.carolina.res.rr.com. [24.74.69.118]) by smtp.gmail.com with ESMTPSA id h3sm4332087qkk.82.2021.05.28.15.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 15:41:49 -0700 (PDT) From: Karl Stump To: emacs-orgmode@gnu.org Subject: [PATCH] Fixed lstset where language= wipes out previous definitions Date: Fri, 28 May 2021 18:40:59 -0400 Message-Id: <20210528224059.2972-1-karlstump@gmail.com> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f35; envelope-from=karlstump@gmail.com; helo=mail-qv1-xf35.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_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: , Cc: Karl Stump Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1622241769; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=RIPhtdl/yB3RsMj7FPZmLuUE3L2iufQqxTt9kErCP8I=; b=DuwzJEyxR9U5C6+CjeRDuxrZwquaHc792eO/xWh15agoZ5k3tSbwJxkwWrqslKvDHWihkh IcAmcVg9d0URdhQSrCYhyzATqvLUKMLkJeYVh+zlNCZyJJiqGemEp8PzoCQ9vA/6Rte+zf Q+yrO0z5qaVRh1cqpbDDQNkjG7e30mXbwHewqCIQ9luhlPvQn1DYydXyhYlY/mZhGxopA+ pWSQNWkfvegxuTkltwHWWDqf87bddCd801X4EWWATUhwIuQJZVOhETjDm1Y0Ko7KhYUpge Hit0RtTHX6WdYNEU3/tLldcF7fOI/8uKCQOdc9a7ZgdBt078HycBgP1E/IFUAw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1622241769; a=rsa-sha256; cv=none; b=dzVI7YzFXSA6F9LBXD50OP7K1h2JgQwF5b3HGNuxsXaH5Gj0vEchUCvzTDrms0x/XhCdW9 TgTrsqelhsPYh+ElcwOhAYhG1MhuSx3AR2uvaiORnPQVMaCOHvMj20YUhW+f/dxOdicQUY mczbSjuw3CfNsUygAaB2xZlnRsUcqeKyyT0ME3PLA7TbxRT0w2iEcB3lisUC2+rRCC2F2d YHldDs9UlOZqgN9z74NnxrIDFVmPeuCPP72FFfCilLW/hU2sFo8n9E9C8y2HAetXGWTLdh nTx1dfvTcNKxOXbuHKkCpHfuaxxJMWRLQF8kqeK53dfrymhlmyZCxeK165SdNw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Y4obP4km; 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-Spam-Score: 1.87 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=Y4obP4km; 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: 85F0B1933C X-Spam-Score: 1.87 X-Migadu-Scanner: scn0.migadu.com X-TUID: F2c/p3Vb1ZBE * ox-latex.el (org-latex-src-block): moved (("language" ,lst-lang)) to the head of the list. This fixes wiping out preceding definitions given in `org-latex-listings-options'. TINYCHANGE --- lisp/ox-latex.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index b9ecf070a..f956c851e 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -3075,13 +3075,13 @@ contextual information." (concat (org-latex--make-option-string (append - lst-opt + `(("language" ,lst-lang)) + lst-opt (cond ((and (not float) (plist-member attributes :float)) nil) ((string= "multicolumn" float) '(("float" "*"))) ((and float (not (assoc "float" lst-opt))) `(("float" ,(plist-get info :latex-default-figure-position))))) - `(("language" ,lst-lang)) (if label `(("label" ,(org-latex--label src-block info))) '(("label" " "))) -- 2.31.0