* lib/lyx2lyx/LyX.py (get_encoding):

	- handle the "utf8x" inputenc option (part of bug 4503).

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

diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index 586410da9e0f850a5b671eb8f264efdefe8ef585..ad41ba7a8189b7e055f680ae9648737f7b81601c 100644 (file)
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -132,6 +132,8 @@ def get_encoding(language, inputencoding, format, cjk_encoding):
         return lang[language][3]
     if inputencoding == "":
         return "latin1"
+    if inputencoding == "utf8x":
+        return "utf8"
     # python does not know the alias latin9
     if inputencoding == "latin9":
         return "iso-8859-15"