1 files changed, 3 insertions, 3 deletions
diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
index f7c1fd4c7e2d..2b142a4bffb2 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleAbstractPanel.java
@@ -201,7 +201,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
 
   private int getAdjustedRightMargin() {
     int result = getRightMargin();
-    return result > 0 ? result : CodeStyleFacade.getInstance(ProjectUtil.guessCurrentProject(getPanel())).getRightMargin();
+    return result > 0 ? result : CodeStyleFacade.getInstance(ProjectUtil.guessCurrentProject(getPanel())).getRightMargin(getDefaultLanguage());
   }
 
   protected abstract int getRightMargin();
@@ -226,7 +226,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
           catch (ConfigurationException ignore) {
           }
           CodeStyleSettings clone = mySettings.clone();
-          clone.RIGHT_MARGIN = getAdjustedRightMargin();
+          clone.setRightMargin(getDefaultLanguage(), getAdjustedRightMargin());
           CodeStyleSettingsManager.getInstance(project).setTemporarySettings(clone);
           PsiFile formatted;
           try {
@@ -267,7 +267,7 @@ public abstract class CodeStyleAbstractPanel implements Disposable {
       Document document = documentManager.getDocument(psiFile);
       if (document != null) {
         CodeStyleSettings clone = mySettings.clone();
-        clone.RIGHT_MARGIN = getAdjustedRightMargin();
+        clone.setRightMargin(getDefaultLanguage(), getAdjustedRightMargin());
         CodeStyleSettingsManager.getInstance(project).setTemporarySettings(clone);
         try {
           CodeStyleManager.getInstance(project).reformat(psiFile);