* Fix encoding problem following a Listing (bug 5783).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28830 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 0b37de782907bcfdf513e8bb8e0987ce62fb2f51..0ce91d7b3ee05a28182ab92313d9674521fc0d4a 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -238,7 +238,6 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
                OutputParams rp = runparams;
                rp.moving_arg = true;
                docstring const caption = getCaption(rp);
-               runparams.encoding = rp.encoding;
                if (param_string.empty() && caption.empty())
                        os << "\n\\begin{lstlisting}\n";
                else {

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index be294b74ddc599d5e8ca780a4609b9caf2b8e084..c9538ca9a66d723a8b9dc32fd5f238a233e0f156 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -442,11 +442,8 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                        // With CJK, only add switch if we have CJK content at the beginning
                        // of the paragraph
                        if (encoding->package() != Encoding::CJK || i == 0) {
-                               OutputParams tmp_rp = runparams;
-                               runparams.moving_arg = false;
                                pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
                                        *encoding);
-                               runparams = tmp_rp;
                                // the following is necessary after a CJK environment in a multilingual
                                // context (nesting issue).
                                if (par_language->encoding()->package() == Encoding::CJK &&