X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fencodings;h=265f3b9c1ceaa4a4f7f896e48beab67813ecf87e;hb=97c4feea7103b06cacb3002dac01ebf9a82f4e35;hp=679ce5f93d2dfff4477d534a2c56d511b49700ce;hpb=14eb8d4d0a9ae296282a0ca9de94066ed68cdae6;p=lyx.git

diff --git a/lib/encodings b/lib/encodings
index 679ce5f93d..265f3b9c1c 100644
--- a/lib/encodings
+++ b/lib/encodings
@@ -177,8 +177,11 @@ Encoding euc-jp-plain EUC-JP-plain EUC-JP variable none
 End
 Encoding jis-plain JIS-plain JIS variable none
 End
-Encoding shift-jis-plain SJIS-plain SJIS variable none
-End
+# The SJIS encoding can't be taken as is, therefore it is disabled here
+# as long as someone build in the needed conversion, described here:
+# http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129935.html
+#Encoding shift-jis-plain SJIS-plain SJIS variable none
+#End
 
 # This one needs hardcoded support, since the inputenc package does not know
 # tis620-0, and thailatex sets up babel directly to use tis620-0, so the