summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Lib/idlelib/EditorWindow.py10
-rw-r--r--Lib/idlelib/NEWS.txt2
2 files changed, 7 insertions, 5 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 560e5e7d89..6b8ab63ddc 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -1277,13 +1277,13 @@ class EditorWindow(object):
"Toggle tabs",
"Turn tabs " + ("on", "off")[self.usetabs] +
"?\nIndent width " +
- ("will be", "remains at")[self.usetabs] + " 8.",
+ ("will be", "remains at")[self.usetabs] + " 8." +
+ "\n Note: a tab is always 8 columns",
parent=self.text):
self.usetabs = not self.usetabs
- # Try to prevent mixed tabs/spaces.
- # User must reset indent width manually after using tabs
- # if he insists on getting into trouble.
- self.indentwidth = 8
+ # Try to prevent inconsistent indentation.
+ # User must change indent width manually after using tabs.
+ self.indentwidth = 8
return "break"
# XXX this isn't bound to anything -- see tabwidth comments
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 40808c9348..a3ba7384c1 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 1.2c1?
*Release date: XX-AUG-2006*
+- ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1).
+
- When used w/o subprocess, all exceptions were preceded by an error
message claiming they were IDLE internal errors (since 1.2a1).