1. Clarify "tab/space" Error Dialog and "Tab Width" Dialog associated with

   the Untabify command.
2. Corrected "tab/space" Error Dialog to show correct menu for Untabify.
   Patch 1196980 Jeff Shute

M EditorWindow.py
M NEWS.txt
M ScriptBinding.py

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index ef825f18895b6d505aa69fc96924c8060368eecd..3c4585bcf88fb57a86b7ed24fd8a18f03d99f326 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -1271,7 +1271,7 @@ class EditorWindow(object):
     def _asktabwidth(self):
         return self.askinteger(
             "Tab width",
-            "Spaces per tab? (2-16)",
+            "Columns per tab? (2-16)",
             parent=self.text,
             initialvalue=self.indentwidth,
             minvalue=2,

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 341e241d3f68ac9474650c555ddfde38a5c6b29d..7799bf40bb59d14f7dd4688b6365d8504bbeafa8 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,12 @@ What's New in IDLE 1.2a0?
 
 *Release date: XX-XXX-2005*
 
+- Clarify "tab/space" Error Dialog and "Tab Width" Dialog associated with
+  the Untabify command.
+
+- Corrected "tab/space" Error Dialog to show correct menu for Untabify.
+  Patch 1196980 Jeff Shute
+
 - New files are colorized by default, and colorizing is removed when
   saving as non-Python files. Patch 1196895 Jeff Shute
   Closes Python Bugs 775012 and 800432, partial fix IDLEfork 763524

diff --git a/Lib/idlelib/ScriptBinding.py b/Lib/idlelib/ScriptBinding.py
index 0017d198d1cd8130c448aec433a04ec71eb59615..3e92c802135ad274eb9c724e14ac1fc51ceef825 100644 (file)
--- a/Lib/idlelib/ScriptBinding.py
+++ b/Lib/idlelib/ScriptBinding.py
@@ -31,16 +31,13 @@ IDENTCHARS = string.ascii_letters + string.digits + "_"
 
 indent_message = """Error: Inconsistent indentation detected!
 
-This means that either:
+1) Your indentation is outright incorrect (easy to fix), OR
 
-1) your indentation is outright incorrect (easy to fix), or
-
-2) your indentation mixes tabs and spaces in a way that depends on \
-how many spaces a tab is worth.
-
-To fix case 2, change all tabs to spaces by using Select All followed \
-by Untabify Region (both in the Edit menu)."""
+2) Your indentation mixes tabs and spaces.
 
+To fix case 2, change all tabs to spaces by using Edit->Select All followed \
+by Format->Untabify Region and specify the number of columns used by each tab.
+"""
 
 class ScriptBinding: