M AutoExpand.py
M Bindings.py
M EditorWindow.py
M PyShell.py
M config-keys.def
M configHandler.py
M help.txt

1. Annotate the shell window with last restart boundary upon restart.
2. Provide a shell menu entry and hot key (F6) to jump to the last
   restart boundary.
3. Add a new shell menu feature to restart the shell.
4. Update the help menu to add these features.
5. Update the help menu to put text in same order as the menus.
6. Correct a capitalization inconsistency on the Edit menu: Expand Word
7. Rename the "Debug" menu to be "Shell": it's doing more now.
8. Rearrange the "Shell" menu to make the StackViewer entries adjacent.
9. Add a get_geometry method to EditorWindow, which may be of use in
   making window positions persisent.
10. Make <ctrl-v> the "Classic Windows" paste key.
11. Restore decorum on the Help menu by removing "Advice".  As Guido said,
    things will never be the same.  Thanks, David!
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 96a894a..47256dc 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -60,6 +60,7 @@
                 'recent-files.lst')
         self.vbar = vbar = Scrollbar(top, name='vbar')
         self.text_frame = text_frame = Frame(top)
+        self.width = idleConf.GetOption('main','EditorWindow','width')
         self.text = text = Text(text_frame, name='text', padx=5, wrap='none',
                 foreground=idleConf.GetHighlight(currentTheme,
                         'normal',fgBg='fg'),
@@ -71,7 +72,7 @@
                         'hilite',fgBg='bg'),
                 insertbackground=idleConf.GetHighlight(currentTheme,
                         'cursor',fgBg='fg'),
-                width=idleConf.GetOption('main','EditorWindow','width'),
+                width=self.width,
                 height=idleConf.GetOption('main','EditorWindow','height') )
 
         self.createmenubar()
@@ -84,7 +85,6 @@
         text.bind("<<paste>>", self.paste)
         text.bind("<<center-insert>>", self.center_insert_event)
         text.bind("<<help>>", self.help_dialog)
-        text.bind("<<good-advice>>", self.good_advice)
         text.bind("<<view-readme>>", self.view_readme)
         text.bind("<<python-docs>>", self.python_docs)
         text.bind("<<about-idle>>", self.about_dialog)
@@ -213,7 +213,7 @@
         ("edit", "_Edit"),
         ("format", "F_ormat"),
         ("run", "_Run"),
-        ("settings", "_Settings"),
+        ("options", "_Options"),
         ("windows", "_Windows"),
         ("help", "_Help"),
     ]
@@ -277,9 +277,6 @@
     def config_dialog(self, event=None):
         configDialog.ConfigDialog(self.top,'Settings')
 
-    def good_advice(self, event=None):
-        tkMessageBox.showinfo('Advice', "Don't Panic!", master=self.text)
-
     def view_readme(self, event=None):
         fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'README.txt')
         textView.TextViewer(self.top,'IDLEfork - README',fn)
@@ -666,6 +663,13 @@
         text = self.text
         return int(float(text.index(mark)))
 
+    def get_geometry(self):
+        "Return (width, height, x, y)"
+        geom = self.top.wm_geometry()
+        m = re.match(r"(\d+)x(\d+)\+(-?\d+)\+(-?\d+)", geom)
+        tuple = (map(int, m.groups()))
+        return tuple
+
     def close_event(self, event):
         self.close()