emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/org be2246a550: ox-latex: Change lost in conflict resol


From: ELPA Syncer
Subject: [elpa] externals/org be2246a550: ox-latex: Change lost in conflict resolution
Date: Sun, 18 Sep 2022 09:57:49 -0400 (EDT)

branch: externals/org
commit be2246a550b444560ec1718c11185ac7bfcfa646
Author: TEC <git@tecosaur.net>
Commit: TEC <git@tecosaur.net>

    ox-latex: Change lost in conflict resolution
    
    * lisp/ox-latex.el (org-latex-generate-engraved-preamble): Amends
    795783d6445c where the number of arguments
    `org-latex-generate-engraved-preamble' takes was reduced to 1, but the
    change to the defun line was lost during conflict resolution.
---
 lisp/ox-latex.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 1eb70ab208..68ec718831 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -1253,7 +1253,7 @@ used.  When nil, no theme is applied."
   :group 'org-export-latex
   :type 'symbol)
 
-(defun org-latex-generate-engraved-preamble (info syntax-colours-p)
+(defun org-latex-generate-engraved-preamble (info)
   "Generate the preamble to setup engraved code.
 The result is constructed from the :latex-engraved-preamble and
 :latex-engraved-optionsn export options, the default values of



reply via email to

[Prev in Thread] Current Thread [Next in Thread]