@@ -41,6 +41,14 @@
                Squeezer)
 
 
+def init_validators(page):
+    digits_or_empty_re = re.compile(r'[0-9]*')
+    def is_digits_or_empty(s):
+        "Return 's is blank or contains only digits'"
+        return digits_or_empty_re.fullmatch(s) is not None
+    return (page.register(is_digits_or_empty), '%P',)
+
+
 class ConfigDialog(Toplevel):
     """Config dialog for IDLE.
     """
@@ -120,7 +128,7 @@ def create_widgets(self):
         note.add(self.fontpage, text='Fonts/Tabs')
         note.add(self.highpage, text='Highlights')
         note.add(self.keyspage, text=' Keys ')
-        note.add(self.editpage, text=' Editor ')
+        note.add(self.editpage, text=' Editor/Shell ')
         note.add(self.genpage, text=' General ')
         note.add(self.extpage, text='Extensions')
         note.enable_traversal()
@@ -1781,6 +1789,7 @@ class EditPage(Frame):
 
     def __init__(self, master):
         super().__init__(master)
+        self.digits_only = init_validators(self)
         self.create_page_editor()
         self.load_editor_cfg()
 
@@ -1926,18 +1935,10 @@ class GenPage(Frame):
 
     def __init__(self, master):
         super().__init__(master)
-
-        self.init_validators()
+        self.digits_only = init_validators(self)
         self.create_page_general()
         self.load_general_cfg()
 
-    def init_validators(self):
-        digits_or_empty_re = re.compile(r'[0-9]*')
-        def is_digits_or_empty(s):
-            "Return 's is blank or contains only digits'"
-            return digits_or_empty_re.fullmatch(s) is not None
-        self.digits_only = (self.register(is_digits_or_empty), '%P',)
-
     def create_page_general(self):
         """Return frame of widgets for General tab.
 
 
@@ -1228,10 +1228,14 @@ def test_load_editor_cfg(self):
         d.autosave.set(1)
         d.format_width.set(1)
         d.context_lines.set(1)
+        d.line_numbers_default.set(True)
+        d.auto_squeeze_min_lines.set(1)
         d.load_editor_cfg()
         eq(d.autosave.get(), 0)
         eq(d.format_width.get(), '72')
         eq(d.context_lines.get(), '15')
+        eq(d.line_numbers_default.get(), False)
+        eq(d.auto_squeeze_min_lines.get(), '50')
 
     def test_autosave(self):
         d = self.page
@@ -1250,6 +1254,19 @@ def test_context(self):
         self.page.context_int.insert(0, '1')
         self.assertEqual(extpage, {'CodeContext': {'maxlines': '1'}})
 
+    def test_line_numbers(self):
+        d = self.page
+        d.line_numbers_default.set(True)
+        d.line_numbers_default_bool.invoke()
+        self.assertEqual(mainpage, {'EditorWindow': {'line-numbers-default': 'False'}})
+        d.line_numbers_default_bool.invoke()
+        self.assertEqual(mainpage, {'EditorWindow': {'line-numbers-default': 'True'}})
+
+    def test_auto_squeeze(self):
+        self.page.auto_squeeze_min_lines_int.delete(0, 'end')
+        self.page.auto_squeeze_min_lines_int.insert(0, '99')
+        self.assertEqual(mainpage, {'PyShell': {'auto-squeeze-min-lines': '99'}})
+
 
 class GenPageTest(unittest.TestCase):
     """Test that general tab widgets enable users to make changes.