Log the error when the encoding doesn't exist.

editorconfig · Apr 26, 2013 · d4ea8ee · d4ea8ee
1 parent ffa2d36
commit d4ea8ee
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/org/editorconfig/jedit/EditorConfigPlugin.java b/src/org/editorconfig/jedit/EditorConfigPlugin.java
@@ -37,6 +37,7 @@
 import org.gjt.sp.jedit.EditBus;
 import org.gjt.sp.jedit.EditPlugin;
 import org.gjt.sp.jedit.buffer.JEditBuffer;
+import org.gjt.sp.jedit.io.EncodingServer;
 import org.gjt.sp.jedit.msg.BufferUpdate;
 import org.gjt.sp.util.Log;
 
@@ -177,9 +178,16 @@ else if (ecConf.charset.equals("latin1"))
                 charset = "US-ASCII";
             else if (ecConf.charset.equals("utf-8-bom"))
                 charset = "UTF-8Y";
+            else // Other unknown charset
+                Log.log(Log.ERROR, this,
+                        "Unrecognized charset: charset=" + ecConf.charset);
         }
         else if (ecConf.jeditCharset != null)
-            charset = ecConf.jeditCharset;
+            if(EncodingServer.hasEncoding(ecConf.jeditCharset))
+                charset = ecConf.jeditCharset;
+            else
+                Log.log(Log.ERROR, this,
+                        "Unrecognized charset jedit_charset=" + ecConf.jeditCharset);
 
         // if we have a valid charset and the charset is different from the
         // current one, we set it and disable the encoding auto detection