Index: debian/changelog
===================================================================
--- debian/changelog	(revision 10200)
+++ debian/changelog	(working copy)
@@ -1,4 +1,4 @@
-codeblocks (13.12svn9513) unstable; urgency=low
+codeblocks (13.12svn10200) unstable; urgency=low
 
   * New svn revision
 
Index: src/sdk/cbeditor.cpp
===================================================================
--- src/sdk/cbeditor.cpp	(revision 10200)
+++ src/sdk/cbeditor.cpp	(working copy)
@@ -1510,10 +1510,15 @@
     control->SetScrollWidthTracking(      mgr->ReadBool(_T("/margin/scroll_width_tracking"), false));
     control->SetMultipleSelection(        mgr->ReadBool(_T("/selection/multi_select"),       false));
     control->SetAdditionalSelectionTyping(mgr->ReadBool(_T("/selection/multi_typing"),       false));
+    
+    unsigned virtualSpace = 0;
+    if (mgr->ReadBool(_T("/selection/use_rect_vspace"), false))
+        virtualSpace |= wxSCI_SCVS_RECTANGULARSELECTION;
     if (mgr->ReadBool(_T("/selection/use_vspace"), false))
-        control->SetVirtualSpaceOptions(wxSCI_SCVS_RECTANGULARSELECTION | wxSCI_SCVS_USERACCESSIBLE);
-    else
-        control->SetVirtualSpaceOptions(wxSCI_SCVS_NONE);
+        virtualSpace |= wxSCI_SCVS_USERACCESSIBLE;
+    if (!virtualSpace)
+        virtualSpace = wxSCI_SCVS_NONE; // Just in case wxSCI_SCVS_NONE != 0
+    control->SetVirtualSpaceOptions(virtualSpace);
 }
 
 // static
Index: src/src/editorconfigurationdlg.cpp
===================================================================
--- src/src/editorconfigurationdlg.cpp	(revision 10200)
+++ src/src/editorconfigurationdlg.cpp	(working copy)
@@ -177,7 +177,8 @@
     XRCCTRL(*this, "slCaretPeriod",  wxSlider)->SetValue(cfg->ReadInt(_T("/caret/period"), 500));
 
     //selections
-    XRCCTRL(*this, "chkEnableVirtualSpace", wxCheckBox)->SetValue(cfg->ReadBool(_T("/selection/use_vspace"), false));
+    XRCCTRL(*this, "chkEnableVirtualSpace",     wxCheckBox)->SetValue(cfg->ReadBool(_T("/selection/use_vspace"),      false));
+    XRCCTRL(*this, "chkEnableRectVirtualSpace", wxCheckBox)->SetValue(cfg->ReadBool(_T("/selection/use_rect_vspace"), false));
     bool multiSelectEnabled = cfg->ReadBool(_T("/selection/multi_select"), false);
     XRCCTRL(*this, "chkEnableMultipleSelections",        wxCheckBox)->SetValue(multiSelectEnabled);
     XRCCTRL(*this, "chkEnableAdditionalSelectionTyping", wxCheckBox)->SetValue(cfg->ReadBool(_T("/selection/multi_typing"), false));
@@ -1092,6 +1093,7 @@
 
         //selections
         cfg->Write(_T("/selection/use_vspace"),      (bool)XRCCTRL(*this, "chkEnableVirtualSpace",              wxCheckBox)->GetValue());
+        cfg->Write(_T("/selection/use_rect_vspace"), (bool)XRCCTRL(*this, "chkEnableRectVirtualSpace",          wxCheckBox)->GetValue());
         cfg->Write(_T("/selection/multi_select"),    (bool)XRCCTRL(*this, "chkEnableMultipleSelections",        wxCheckBox)->GetValue());
         cfg->Write(_T("/selection/multi_typing"),    (bool)XRCCTRL(*this, "chkEnableAdditionalSelectionTyping", wxCheckBox)->GetValue());
 
Index: src/src/resources/editor_configuration.xrc
===================================================================
--- src/src/resources/editor_configuration.xrc	(revision 10200)
+++ src/src/resources/editor_configuration.xrc	(working copy)
@@ -1004,6 +1004,9 @@
 											<object class="wxCheckBox" name="chkEnableVirtualSpace">
 												<label>Enable virtual space (space beyond the end of line)</label>
 											</object>
+											<object class="wxCheckBox" name="chkEnableRectVirtualSpace">
+												<label>Enable virtual space for rectangle selections</label>
+											</object>
 											<flag>wxBOTTOM|wxLEFT|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag>
 											<border>4</border>
 										</object>