org-latex-src-block--listings: Put options within lstlisting environment

* 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é <denis.bitouze@univ-littoral.fr>
Link: https://orgmode.org/list/87pmepvb7u.fsf@example.com
This commit is contained in:
Ihor Radchenko 2022-10-18 16:09:19 +08:00
parent 5098404b19
commit 6ef33b6dd6
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
1 changed files with 4 additions and 6 deletions

View File

@ -3577,9 +3577,9 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
(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 @@ and FLOAT are extracted from SRC-BLOCK and INFO in `org-latex-src-block'."
(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