From ea49ecf435d7767e03a97229b19d5ed88ad6762b Mon Sep 17 00:00:00 2001
From: Vassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Date: Tue, 3 Dec 2013 18:31:14 +0400
Subject: [PATCH] IDEA-103199 Undo: UTF problem

---
 .../intellij/openapi/command/impl/EditorChangeAction.java   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java
index 643b6e60c14e..095fb180bc7a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/EditorChangeAction.java
@@ -52,8 +52,10 @@ public class EditorChangeAction extends BasicUndoableAction {
                             long oldTimeStamp) {
     super(document);
 
-    Charset charset = EncodingManager.getInstance().getEncoding(FileDocumentManager.getInstance().getFile(document), false);
-    myCharset = charset == null ? Charset.defaultCharset() : charset;
+    Charset charset = EncodingManager.getInstance().getEncoding(FileDocumentManager.getInstance().getFile(document), true);
+    if (charset == null) charset = EncodingManager.getInstance().getDefaultCharset();
+    if (charset == null) charset = Charset.defaultCharset();
+    myCharset = charset;
 
     myOffset = offset;
     myOldString = oldString == null ? "" : compressCharSequence(oldString, myCharset);