Merge branch 'sdombrovsky/virtual_lines'

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java
index 407cf0a6e20ea5972a17639138826353a1395db1..5e79824d150804ad45a9eb5195608609c05ecba9 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SettingsImpl.java
@@ -53,7 +53,7 @@ public class SettingsImpl implements EditorSettings {
 
   // This group of settings does not have UI
   private SoftWrapAppliancePlaces mySoftWrapAppliancePlace        = SoftWrapAppliancePlaces.MAIN_EDITOR;
-  private int                     myAdditionalLinesCount          = 5;
+  private int                     myAdditionalLinesCount          = Registry.intValue("editor.virtual.lines", 5);
   private int                     myAdditionalColumnsCount        = 3;
   private int                     myLineCursorWidth               = Registry.intValue("editor.caret.width", 2);
   private boolean                 myLineMarkerAreaShown           = true;

diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index ad9da2645a5bc9ae232ed000e39005740369c18d..6a518fdf1268f46249a575904b3820f58121b25d 100644 (file)
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -182,6 +182,9 @@ editor.navigation.history.stack.size.description=Stack size limit for back/forwa
 
 editor.reformat.on.typing=false
 
+editor.virtual.lines=5
+editor.virtual.lines.description=Number of virtual empty lines displayed at the editor bottom
+
 ide.showIndexRebuildMessage=false
 
 ide.tabbedPane.bufferedPaint=true