From: Kurt B. Kaiser <kbk@shore.net>
Date: Sun, 12 Jun 2005 05:19:23 +0000 (+0000)
Subject: 1. Clarify "tab/space" Error Dialog and "Tab Width" Dialog associated with
X-Git-Tag: v2.5a0~1707
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ca7329c9c124080b817ceb67b4e3ee7963b81d41;p=thirdparty%2FPython%2Fcpython.git

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 ef825f18895b..3c4585bcf88f 100644
--- 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 341e241d3f68..7799bf40bb59 100644
--- 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 0017d198d1cd..3e92c802135a 100644
--- 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: