? bug168965.patch
? bug306847.patch
? bug308237.patch
? bug309187.patch
? bug311187.patch
? bug_undo.patch
? depcomp
? intltool-extract.in
? intltool-merge.in
? intltool-update.in
? gedit/.gedit-debug.h.swp
? gedit/recent-files/egg-recent-item.c.paolo
? gedit/recent-files/egg-recent-view-bonobo.c.paolo
? gedit/recent-files/patch.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gedit/ChangeLog,v
retrieving revision 1.565
diff -u -p -r1.565 ChangeLog
--- ChangeLog	4 Aug 2005 15:46:16 -0000	1.565
+++ ChangeLog	5 Aug 2005 10:24:21 -0000
@@ -1,3 +1,11 @@
+2005-08-05  Paolo Maggi  <paolo@gnome.org>
+
+	Fixed bug #101281: [ui-review] Undo preference dialog
+
+	* data/gedit.schemas.in: deprecated key 
+	/schemas/apps/gedit-2/preferences/editor/undo/undo_actions_limits and
+	added new key .../undo/max_undo_actions
+
 2005-08-04  Paolo Maggi  <paolo@gnome.org>
 
 	Fixed bug #168965: Grammatical error in message 
Index: data/gedit.schemas.in
===================================================================
RCS file: /cvs/gnome/gedit/data/gedit.schemas.in,v
retrieving revision 1.21
diff -u -p -r1.21 gedit.schemas.in
--- data/gedit.schemas.in	4 Aug 2005 15:46:17 -0000	1.21
+++ data/gedit.schemas.in	5 Aug 2005 10:24:21 -0000
@@ -165,9 +165,23 @@
       <type>int</type>
       <default>25</default>
       <locale name="C">
-	<short>Undo Actions Limit</short>
+	<short>Undo Actions Limit (DEPRECATED)</short>
 	<long>Maximum number of actions that gedit will be able to
-	undo or redo.</long>
+	undo or redo. Use "-1" for unlimited number of actions. 
+	Deprecated since 2.12.0</long>
+      </locale>
+    </schema>
+
+    <schema>
+      <key>/schemas/apps/gedit-2/preferences/editor/undo/max_undo_actions</key>
+      <applyto>/apps/gedit-2/preferences/editor/undo/max_undo_actions</applyto>
+      <owner>gedit</owner>
+      <type>int</type>
+      <default>2000</default>
+      <locale name="C">
+	<short>Max Number of Undo Actions</short>
+	<long>Maximum number of actions that gedit will be able to
+	undo or redo. Use "-1" for unlimited number of actions.</long>
       </locale>
     </schema>
 
Index: gedit/ChangeLog
===================================================================
RCS file: /cvs/gnome/gedit/gedit/ChangeLog,v
retrieving revision 1.785
diff -u -p -r1.785 ChangeLog
--- gedit/ChangeLog	4 Aug 2005 14:49:52 -0000	1.785
+++ gedit/ChangeLog	5 Aug 2005 10:24:23 -0000
@@ -1,3 +1,17 @@
+2005-08-05  Paolo Maggi  <paolo@gnome.org>
+
+	Fixed bug #101281: [ui-review] Undo preference dialog
+
+	Based on a patch by Michael Terry <mike@mterry.name>
+
+	* dialogs/gedit-preferences-dialog.c (setup_editor_page)
+	(get_preferences_dialog): removed code releated the the "Undo" 
+	preferences
+
+	* dialogs/gedit-preferences.glade2: removed "Undo" preferences
+
+	* gedit-prefs-manager.h: updated to reflect changes to gedit.schemas.in
+
 ==== gedit 2.10.4 ====
 
 2005-08-04  Paolo Maggi  <paolo@gnome.org>
Index: gedit/gedit-prefs-manager.h
===================================================================
RCS file: /cvs/gnome/gedit/gedit/gedit-prefs-manager.h,v
retrieving revision 1.20
diff -u -p -r1.20 gedit-prefs-manager.h
--- gedit/gedit-prefs-manager.h	11 Jan 2005 01:03:18 -0000	1.20
+++ gedit/gedit-prefs-manager.h	5 Aug 2005 10:24:23 -0000
@@ -58,7 +58,7 @@
 #define GPM_AUTO_SAVE_INTERVAL		GPM_SAVE_DIR "/auto_save_interval"
 
 #define GPM_UNDO_DIR			GPM_PREFS_DIR  "/editor/undo"
-#define GPM_UNDO_ACTIONS_LIMIT		GPM_UNDO_DIR "/undo_actions_limit"
+#define GPM_UNDO_ACTIONS_LIMIT		GPM_UNDO_DIR "/max_undo_actions"
 
 #define GPM_WRAP_MODE_DIR		GPM_PREFS_DIR "/editor/wrap_mode"
 #define GPM_WRAP_MODE			GPM_WRAP_MODE_DIR "/wrap_mode"
@@ -141,7 +141,7 @@
 #define GPM_DEFAULT_AUTO_SAVE		0 /* FALSE */
 #define GPM_DEFAULT_AUTO_SAVE_INTERVAL	10 /* minutes */
 
-#define GPM_DEFAULT_UNDO_ACTIONS_LIMIT	25 /* actions */
+#define GPM_DEFAULT_UNDO_ACTIONS_LIMIT	2000 /* actions */
 
 #define GPM_DEFAULT_WRAP_MODE		"GTK_WRAP_WORD"
 
Index: gedit/dialogs/gedit-preferences-dialog.c
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-preferences-dialog.c,v
retrieving revision 1.72
diff -u -p -r1.72 gedit-preferences-dialog.c
--- gedit/dialogs/gedit-preferences-dialog.c	1 Aug 2005 17:43:45 -0000	1.72
+++ gedit/dialogs/gedit-preferences-dialog.c	5 Aug 2005 10:24:23 -0000
@@ -76,12 +76,6 @@ struct _GeditPreferencesDialog 
 	GtkWidget	*colors_table;
 	GtkWidget	*font_hbox;
 	
-	/* Undo*/
-	GtkWidget	*undo_box;
-	GtkWidget	*limited_undo_radiobutton;
-	GtkWidget	*unlimited_undo_radiobutton;
-	GtkWidget	*undo_levels_spinbutton;
-
 	/* Tabs */
 	GtkWidget	*tabs_width_spinbutton;
 	GtkWidget	*insert_spaces_checkbutton;
@@ -256,56 +250,9 @@ auto_save_spinbutton_value_changed (GtkS
 }
 
 static void
-limited_undo_radiobutton_toggled (GtkToggleButton *button, GeditPreferencesDialog *dlg)
-{
-	gedit_debug (DEBUG_PREFS, "");
-
-	g_return_if_fail (button == GTK_TOGGLE_BUTTON (dlg->limited_undo_radiobutton));
-
-	if (gtk_toggle_button_get_active (button))
-	{
-		gint undo_levels;
-		
-		gtk_widget_set_sensitive (dlg->undo_levels_spinbutton, 
-					  gedit_prefs_manager_undo_actions_limit_can_set());
-		
-		undo_levels = gtk_spin_button_get_value_as_int (
-				GTK_SPIN_BUTTON (dlg->undo_levels_spinbutton));
-		g_return_if_fail (undo_levels >= 1);
-
-		gedit_prefs_manager_set_undo_actions_limit (undo_levels);
-	}
-	else	
-	{
-		gtk_widget_set_sensitive (dlg->undo_levels_spinbutton, FALSE);
-
-		gedit_prefs_manager_set_undo_actions_limit (-1);
-	}
-}
-
-static void
-undo_levels_spinbutton_value_changed (GtkSpinButton          *spin_button,
-				      GeditPreferencesDialog *dlg)
-{
-	gint undo_levels;
-
-	gedit_debug (DEBUG_PREFS, "");
-
-	g_return_if_fail (spin_button == GTK_SPIN_BUTTON (dlg->undo_levels_spinbutton));
-
-	undo_levels = gtk_spin_button_get_value_as_int (
-				GTK_SPIN_BUTTON (dlg->undo_levels_spinbutton));
-	g_return_if_fail (undo_levels >= 1);
-
-	gedit_prefs_manager_set_undo_actions_limit (undo_levels);
-}
-
-static void
 setup_editor_page (GeditPreferencesDialog *dlg)
 {
 	gboolean auto_save;
-	gint undo_levels;
-	gboolean can_set;
 	gint auto_save_interval;
 
 	gedit_debug (DEBUG_PREFS, "");
@@ -334,21 +281,6 @@ setup_editor_page (GeditPreferencesDialo
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->auto_save_spinbutton),
 				   auto_save_interval);
 
-	undo_levels = gedit_prefs_manager_get_undo_actions_limit ();
-	
-	if (undo_levels > 0)
-	{
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->undo_levels_spinbutton),
-					   (guint) undo_levels);
-
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->limited_undo_radiobutton), 
-				              TRUE);
-	}
-	else
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dlg->unlimited_undo_radiobutton), 
-				              TRUE);
-
-
 	/* Set widget sensitivity */
 	gtk_widget_set_sensitive (dlg->tabs_width_hbox, 
 				  gedit_prefs_manager_tabs_size_can_set ());
@@ -368,11 +300,6 @@ setup_editor_page (GeditPreferencesDialo
 			          auto_save &&
 				  gedit_prefs_manager_auto_save_interval_can_set ());
 
-	can_set = gedit_prefs_manager_undo_actions_limit_can_set ();
-
-	gtk_widget_set_sensitive (dlg->undo_box, can_set);
-	gtk_widget_set_sensitive (dlg->undo_levels_spinbutton, can_set && (undo_levels > 0));
-
 	/* Connect signal */
 	g_signal_connect (G_OBJECT (dlg->tabs_width_spinbutton), "value_changed",
 			  G_CALLBACK (tabs_width_spinbutton_value_changed),
@@ -397,14 +324,6 @@ setup_editor_page (GeditPreferencesDialo
 	g_signal_connect (G_OBJECT (dlg->auto_save_spinbutton), "value_changed",
 			  G_CALLBACK (auto_save_spinbutton_value_changed),
 			  dlg);
-
-	g_signal_connect (G_OBJECT (dlg->limited_undo_radiobutton), "toggled", 
-		  	  G_CALLBACK (limited_undo_radiobutton_toggled), 
-			  dlg);
-
-	g_signal_connect (G_OBJECT (dlg->undo_levels_spinbutton), "value_changed",
-		  	  G_CALLBACK (undo_levels_spinbutton_value_changed),
-		  	  dlg);
 }
 
 static void
@@ -1352,11 +1271,6 @@ get_preferences_dialog (GtkWindow *paren
 	dialog->auto_save_checkbutton = glade_xml_get_widget (gui, "auto_save_checkbutton");
 	dialog->auto_save_spinbutton = glade_xml_get_widget (gui, "auto_save_spinbutton");
 
-	dialog->limited_undo_radiobutton = glade_xml_get_widget (gui, "limited_undo_radiobutton");
-	dialog->unlimited_undo_radiobutton = glade_xml_get_widget (gui, "unlimited_undo_radiobutton");
-	dialog->undo_levels_spinbutton = glade_xml_get_widget (gui, "undo_levels_spinbutton");
-	dialog->undo_box = glade_xml_get_widget (gui, "undo_box");
-
 	dialog->plugin_manager_place_holder = glade_xml_get_widget (gui, "plugin_manager_place_holder");
 
 	dialog->enable_syntax_hl_checkbutton = glade_xml_get_widget (gui, "enable_syntax_hl_checkbutton");
@@ -1400,10 +1314,6 @@ get_preferences_dialog (GtkWindow *paren
 	    !dialog->backup_copy_checkbutton ||
 	    !dialog->auto_save_checkbutton ||
 	    !dialog->auto_save_spinbutton ||
-	    !dialog->limited_undo_radiobutton ||
-	    !dialog->unlimited_undo_radiobutton ||
-	    !dialog->undo_levels_spinbutton ||
-	    !dialog->undo_box ||
 	    !dialog->plugin_manager_place_holder ||
 	    !dialog->enable_syntax_hl_checkbutton ||
 	    !dialog->hl_vbox ||
Index: gedit/dialogs/gedit-preferences.glade2
===================================================================
RCS file: /cvs/gnome/gedit/gedit/dialogs/gedit-preferences.glade2,v
retrieving revision 1.47
diff -u -p -r1.47 gedit-preferences.glade2
--- gedit/dialogs/gedit-preferences.glade2	11 Jan 2005 01:03:19 -0000	1.47
+++ gedit/dialogs/gedit-preferences.glade2	5 Aug 2005 10:24:23 -0000
@@ -16,6 +16,7 @@
   <property name="skip_pager_hint">False</property>
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
   <property name="has_separator">False</property>
 
   <child internal-child="vbox">
@@ -75,22 +76,22 @@
 	  <property name="enable_popup">False</property>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox224">
+	    <widget class="GtkVBox" id="vbox228">
 	      <property name="border_width">12</property>
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">18</property>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox225">
+		<widget class="GtkVBox" id="vbox226">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label846">
+		    <widget class="GtkLabel" id="label848">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Tab Stops&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Text Wrapping&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -113,13 +114,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox141">
+		    <widget class="GtkHBox" id="hbox142">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label847">
+			<widget class="GtkLabel" id="label849">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -144,73 +145,35 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox205">
+			<widget class="GtkVBox" id="wrap_mode_frame">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="tabs_width_hbox">
+			    <widget class="GtkCheckButton" id="wrap_text_checkbutton">
 			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkLabel" id="label98">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Tab width:</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">tabs_width_spinbutton</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkSpinButton" id="tabs_width_spinbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">True</property>
-				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">False</property>
-				  <property name="adjustment">8 1 24 1 4 8</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Enable text _wrapping</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
 			    </packing>
 			  </child>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="insert_spaces_checkbutton">
+			    <widget class="GtkCheckButton" id="split_checkbutton">
+			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Insert _spaces instead of tabs</property>
+			      <property name="label" translatable="yes">Do not _split words over two lines</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -227,35 +190,35 @@
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox227">
+		<widget class="GtkVBox" id="vbox217">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label851">
+		    <widget class="GtkLabel" id="label854">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Automatic Indentation&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Line Numbers&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -278,13 +241,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox143">
+		    <widget class="GtkHBox" id="hbox137">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label852">
+			<widget class="GtkLabel" id="label843">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -309,28 +272,41 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkCheckButton" id="auto_indent_checkbutton">
+			<widget class="GtkVBox" id="vbox222">
 			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="label" translatable="yes">_Enable automatic indentation</property>
-			  <property name="use_underline">True</property>
-			  <property name="relief">GTK_RELIEF_NORMAL</property>
-			  <property name="focus_on_click">True</property>
-			  <property name="active">False</property>
-			  <property name="inconsistent">False</property>
-			  <property name="draw_indicator">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">6</property>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="display_line_numbers_checkbutton">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">_Display line numbers</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -342,15 +318,15 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox232">
+		<widget class="GtkVBox" id="vbox244">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label859">
+		    <widget class="GtkLabel" id="label876">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;File Saving&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Current Line&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -373,13 +349,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox147">
+		    <widget class="GtkHBox" id="hbox161">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label860">
+			<widget class="GtkLabel" id="label877">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -404,16 +380,16 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox187">
+			<widget class="GtkVBox" id="vbox245">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="backup_copy_checkbutton">
+			    <widget class="GtkCheckButton" id="highlight_current_line_checkbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Create a _backup copy of files before saving</property>
+			      <property name="label" translatable="yes">Hi_ghlight current line</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -427,87 +403,11 @@
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <widget class="GtkHBox" id="autosave_hbox">
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkCheckButton" id="auto_save_checkbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Autosave files every</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkSpinButton" id="auto_save_spinbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">True</property>
-				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">False</property>
-				  <property name="adjustment">8 1 100 1 10 10</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkLabel" id="label97">
-				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_minutes</property>
-				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_CENTER</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">auto_save_spinbutton</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">False</property>
-			  <property name="fill">False</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
@@ -521,20 +421,20 @@
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox237">
+		<widget class="GtkVBox" id="vbox230">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label865">
+		    <widget class="GtkLabel" id="label855">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Undo&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Right Margin&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -557,13 +457,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox151">
+		    <widget class="GtkHBox" id="hbox145">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label866">
+			<widget class="GtkLabel" id="label856">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -588,69 +488,50 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="undo_box">
+			<widget class="GtkVBox" id="vbox231">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkHBox" id="hbox152">
+			    <widget class="GtkCheckButton" id="right_margin_checkbutton">
 			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">6</property>
-
-			      <child>
-				<widget class="GtkRadioButton" id="limited_undo_radiobutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">_Limit to</property>
-				  <property name="use_underline">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-				  <property name="active">False</property>
-				  <property name="inconsistent">False</property>
-				  <property name="draw_indicator">True</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+			      <property name="can_focus">True</property>
+			      <property name="label" translatable="yes">Display right _margin</property>
+			      <property name="use_underline">True</property>
+			      <property name="relief">GTK_RELIEF_NORMAL</property>
+			      <property name="focus_on_click">True</property>
+			      <property name="active">False</property>
+			      <property name="inconsistent">False</property>
+			      <property name="draw_indicator">True</property>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
 
-			      <child>
-				<widget class="GtkSpinButton" id="undo_levels_spinbutton">
-				  <property name="visible">True</property>
-				  <property name="can_focus">True</property>
-				  <property name="climb_rate">1</property>
-				  <property name="digits">0</property>
-				  <property name="numeric">False</property>
-				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">False</property>
-				  <property name="wrap">False</property>
-				  <property name="adjustment">25 1 1000 1 25 25</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">False</property>
-				</packing>
-			      </child>
+			  <child>
+			    <widget class="GtkHBox" id="right_margin_position_hbox">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkLabel" id="label867">
+				<widget class="GtkLabel" id="label857">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">act_ions</property>
+				  <property name="label" translatable="yes">_Right margin at column:</property>
 				  <property name="use_underline">True</property>
 				  <property name="use_markup">False</property>
 				  <property name="justify">GTK_JUSTIFY_LEFT</property>
 				  <property name="wrap">False</property>
 				  <property name="selectable">False</property>
-				  <property name="xalign">0.5</property>
+				  <property name="xalign">0</property>
 				  <property name="yalign">0.5</property>
 				  <property name="xpad">0</property>
 				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">undo_levels_spinbutton</property>
+				  <property name="mnemonic_widget">right_margin_position_spinbutton</property>
 				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 				  <property name="width_chars">-1</property>
 				  <property name="single_line_mode">False</property>
@@ -662,26 +543,25 @@
 				  <property name="fill">False</property>
 				</packing>
 			      </child>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
 
-			  <child>
-			    <widget class="GtkRadioButton" id="unlimited_undo_radiobutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Unlimited undo</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			      <property name="group">limited_undo_radiobutton</property>
+			      <child>
+				<widget class="GtkSpinButton" id="right_margin_position_spinbutton">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="climb_rate">1</property>
+				  <property name="digits">0</property>
+				  <property name="numeric">True</property>
+				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+				  <property name="snap_to_ticks">True</property>
+				  <property name="wrap">False</property>
+				  <property name="adjustment">80 1 160 1 10 10</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -710,53 +590,17 @@
 		  <property name="fill">False</property>
 		</packing>
 	      </child>
-	    </widget>
-	    <packing>
-	      <property name="tab_expand">False</property>
-	      <property name="tab_fill">True</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label829">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Editor</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0.5</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="type">tab</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkVBox" id="vbox228">
-	      <property name="border_width">12</property>
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">18</property>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox226">
+		<widget class="GtkVBox" id="vbox249">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label848">
+		    <widget class="GtkLabel" id="label881">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Text Wrapping&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Bracket Matching&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -779,13 +623,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox142">
+		    <widget class="GtkHBox" id="hbox163">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label849">
+			<widget class="GtkLabel" id="label882">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -810,35 +654,16 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="wrap_mode_frame">
+			<widget class="GtkVBox" id="vbox250">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="wrap_text_checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Enable text _wrapping</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="split_checkbutton">
+			    <widget class="GtkCheckButton" id="bracket_matching_checkbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Do not _split words over two lines</property>
+			      <property name="label" translatable="yes">Highlight matching _bracket</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -869,21 +694,57 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
+	    </widget>
+	    <packing>
+	      <property name="tab_expand">False</property>
+	      <property name="tab_fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label853">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">View</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox224">
+	      <property name="border_width">12</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">18</property>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox217">
+		<widget class="GtkVBox" id="vbox225">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label854">
+		    <widget class="GtkLabel" id="label846">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Line Numbers&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Tab Stops&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -906,13 +767,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox137">
+		    <widget class="GtkHBox" id="hbox141">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label843">
+			<widget class="GtkLabel" id="label847">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -937,16 +798,73 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox222">
+			<widget class="GtkVBox" id="vbox205">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="display_line_numbers_checkbutton">
-			      <property name="visible">True</property>
+			    <widget class="GtkHBox" id="tabs_width_hbox">
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">6</property>
+
+			      <child>
+				<widget class="GtkLabel" id="label98">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Tab width:</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">tabs_width_spinbutton</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkSpinButton" id="tabs_width_spinbutton">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="climb_rate">1</property>
+				  <property name="digits">0</property>
+				  <property name="numeric">True</property>
+				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+				  <property name="snap_to_ticks">False</property>
+				  <property name="wrap">False</property>
+				  <property name="adjustment">8 1 24 1 4 8</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkCheckButton" id="insert_spaces_checkbutton">
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">_Display line numbers</property>
+			      <property name="label" translatable="yes">Insert _spaces instead of tabs</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -963,15 +881,15 @@
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 		</widget>
@@ -983,15 +901,15 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox244">
+		<widget class="GtkVBox" id="vbox227">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label876">
+		    <widget class="GtkLabel" id="label851">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Current Line&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Automatic Indentation&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1014,13 +932,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox161">
+		    <widget class="GtkHBox" id="hbox143">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label877">
+			<widget class="GtkLabel" id="label852">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -1045,61 +963,48 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox245">
+			<widget class="GtkCheckButton" id="auto_indent_checkbutton">
 			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="highlight_current_line_checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Hi_ghlight current line</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">_Enable automatic indentation</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="focus_on_click">True</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
 			</packing>
 		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
+		      <property name="expand">False</property>
+		      <property name="fill">False</property>
 		    </packing>
 		  </child>
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-		  <property name="fill">True</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
 
 	      <child>
-		<widget class="GtkVBox" id="vbox230">
+		<widget class="GtkVBox" id="vbox232">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label855">
+		    <widget class="GtkLabel" id="label859">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Right Margin&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">&lt;b&gt;File Saving&lt;/b&gt;</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1122,13 +1027,13 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox145">
+		    <widget class="GtkHBox" id="hbox147">
 		      <property name="visible">True</property>
 		      <property name="homogeneous">False</property>
 		      <property name="spacing">0</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label856">
+			<widget class="GtkLabel" id="label860">
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">    </property>
 			  <property name="use_underline">False</property>
@@ -1153,16 +1058,16 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkVBox" id="vbox231">
+			<widget class="GtkVBox" id="vbox187">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">6</property>
 
 			  <child>
-			    <widget class="GtkCheckButton" id="right_margin_checkbutton">
+			    <widget class="GtkCheckButton" id="backup_copy_checkbutton">
 			      <property name="visible">True</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">D_isplay right margin</property>
+			      <property name="label" translatable="yes">Create a _backup copy of files before saving</property>
 			      <property name="use_underline">True</property>
 			      <property name="relief">GTK_RELIEF_NORMAL</property>
 			      <property name="focus_on_click">True</property>
@@ -1178,29 +1083,21 @@
 			  </child>
 
 			  <child>
-			    <widget class="GtkHBox" id="right_margin_position_hbox">
-			      <property name="visible">True</property>
+			    <widget class="GtkHBox" id="autosave_hbox">
 			      <property name="homogeneous">False</property>
 			      <property name="spacing">6</property>
 
 			      <child>
-				<widget class="GtkLabel" id="label857">
+				<widget class="GtkCheckButton" id="auto_save_checkbutton">
 				  <property name="visible">True</property>
-				  <property name="label" translatable="yes">_Right margin at column:</property>
+				  <property name="can_focus">True</property>
+				  <property name="label" translatable="yes">_Autosave files every</property>
 				  <property name="use_underline">True</property>
-				  <property name="use_markup">False</property>
-				  <property name="justify">GTK_JUSTIFY_LEFT</property>
-				  <property name="wrap">False</property>
-				  <property name="selectable">False</property>
-				  <property name="xalign">0</property>
-				  <property name="yalign">0.5</property>
-				  <property name="xpad">0</property>
-				  <property name="ypad">0</property>
-				  <property name="mnemonic_widget">right_margin_position_spinbutton</property>
-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-				  <property name="width_chars">-1</property>
-				  <property name="single_line_mode">False</property>
-				  <property name="angle">0</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+				  <property name="active">False</property>
+				  <property name="inconsistent">False</property>
+				  <property name="draw_indicator">True</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1210,16 +1107,42 @@
 			      </child>
 
 			      <child>
-				<widget class="GtkSpinButton" id="right_margin_position_spinbutton">
+				<widget class="GtkSpinButton" id="auto_save_spinbutton">
 				  <property name="visible">True</property>
 				  <property name="can_focus">True</property>
 				  <property name="climb_rate">1</property>
 				  <property name="digits">0</property>
 				  <property name="numeric">True</property>
 				  <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-				  <property name="snap_to_ticks">True</property>
+				  <property name="snap_to_ticks">False</property>
 				  <property name="wrap">False</property>
-				  <property name="adjustment">80 1 160 1 10 10</property>
+				  <property name="adjustment">8 1 100 1 10 10</property>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label97">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_minutes</property>
+				  <property name="use_underline">True</property>
+				  <property name="use_markup">False</property>
+				  <property name="justify">GTK_JUSTIFY_CENTER</property>
+				  <property name="wrap">False</property>
+				  <property name="selectable">False</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xpad">0</property>
+				  <property name="ypad">0</property>
+				  <property name="mnemonic_widget">auto_save_spinbutton</property>
+				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+				  <property name="width_chars">-1</property>
+				  <property name="single_line_mode">False</property>
+				  <property name="angle">0</property>
 				</widget>
 				<packing>
 				  <property name="padding">0</property>
@@ -1230,125 +1153,17 @@
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">True</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkVBox" id="vbox249">
-		  <property name="visible">True</property>
-		  <property name="homogeneous">False</property>
-		  <property name="spacing">6</property>
-
-		  <child>
-		    <widget class="GtkLabel" id="label881">
-		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Bracket Matching&lt;/b&gt;</property>
-		      <property name="use_underline">False</property>
-		      <property name="use_markup">True</property>
-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
-		      <property name="wrap">False</property>
-		      <property name="selectable">False</property>
-		      <property name="xalign">0</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xpad">0</property>
-		      <property name="ypad">0</property>
-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		      <property name="width_chars">-1</property>
-		      <property name="single_line_mode">False</property>
-		      <property name="angle">0</property>
-		    </widget>
-		    <packing>
-		      <property name="padding">0</property>
-		      <property name="expand">False</property>
-		      <property name="fill">False</property>
-		    </packing>
-		  </child>
-
-		  <child>
-		    <widget class="GtkHBox" id="hbox163">
-		      <property name="visible">True</property>
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label882">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">    </property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">False</property>
-			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">False</property>
-			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
 		      </child>
-
-		      <child>
-			<widget class="GtkVBox" id="vbox250">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">6</property>
-
-			  <child>
-			    <widget class="GtkCheckButton" id="bracket_matching_checkbutton">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Highlight matching bracket</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -1359,8 +1174,8 @@
 		</widget>
 		<packing>
 		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
 		</packing>
 	      </child>
 	    </widget>
@@ -1371,9 +1186,9 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkLabel" id="label853">
+	    <widget class="GtkLabel" id="label829">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">View</property>
+	      <property name="label" translatable="yes">Editor</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
