From: Julien Rioux <jrioux@lyx.org>
Date: Wed, 23 Jan 2013 11:30:15 +0000 (+0100)
Subject: Exclude unsafe encodings when setting the inputencoding value.
X-Git-Tag: 2.1.0beta1~877
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=e5165f7fc356b7a579756a6d77d77088663c6295;p=features.git

Exclude unsafe encodings when setting the inputencoding value.

All of the japanese encodings are safe, but nevertheless the
logic here should exclude unsafe encodings.
---

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 61ce6b87e8..15f8103f99 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -737,7 +737,7 @@ void Preamble::handle_package(Parser &p, string const & name,
 				// we will output a note at the top of the document
 				// explaining what to do.
 				Encoding const * const enc = encodings.fromIconvName(
-					p.getEncoding(), Encoding::japanese, true);
+					p.getEncoding(), Encoding::japanese, false);
 				if (enc)
 					h_inputencoding = enc->name();
 				is_nonCJKJapanese = true;