From f1905d7e854c8a1788f92326b453ebd1e2b4a21b Mon Sep 17 00:00:00 2001 Message-Id: From: Ihor Radchenko Date: Tue, 18 Oct 2022 16:09:19 +0800 Subject: [PATCH] org-latex-src-block--listings: Put options within lstlisting environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/ox-latex.el (org-latex-src-block--listings): Do not use global \lstset to set options. Prefer optional argument to lstlisting environment instead. Reported-by: Denis Bitouzé Link: https://orgmode.org/list/87pmepvb7u.fsf@example.com --- lisp/ox-latex.el | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index dc8477d14..38bdbf661 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -3577,9 +3577,9 @@ (cl-defun org-latex-src-block--listings (org-export-data main info)))))) (lst-opt (plist-get info :latex-listings-options))) (concat - ;; Options. (format - "\\lstset{%s}\n" + "\\begin{lstlisting}[%s]\n%s\\end{lstlisting}" + ;; Options. (concat (org-latex--make-option-string (append @@ -3600,10 +3600,8 @@ (cl-defun org-latex-src-block--listings (t `(("firstnumber" ,(number-to-string (1+ num-start))) ("numbers" "left")))))) (let ((local-options (plist-get attributes :options))) - (and local-options (concat "," local-options))))) - ;; Source code. - (format - "\\begin{lstlisting}\n%s\\end{lstlisting}" + (and local-options (concat "," local-options)))) + ;; Source code. (let* ((code-info (org-export-unravel-code src-block)) (max-width (apply 'max -- 2.35.1