[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5
terry.reedy
python-checkins at python.org
Fri Oct 2 22:13:21 EDT 2015
https://hg.python.org/cpython/rev/fd904e1e4f29
changeset: 98503:fd904e1e4f29
parent: 98499:ec2ef7525fa5
parent: 98502:ff025cf824d0
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Fri Oct 02 22:12:57 2015 -0400
summary:
Merge with 3.5
files:
Lib/idlelib/configDialog.py | 30 +++++++++++++-----------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -43,19 +43,20 @@
#The first value of the tuple is the sample area tag name.
#The second value is the display name list sort index.
self.themeElements={
- 'Normal Text':('normal', '00'),
- 'Python Keywords':('keyword', '01'),
- 'Python Definitions':('definition', '02'),
- 'Python Builtins':('builtin', '03'),
- 'Python Comments':('comment', '04'),
- 'Python Strings':('string', '05'),
- 'Selected Text':('hilite', '06'),
- 'Found Text':('hit', '07'),
- 'Cursor':('cursor', '08'),
- 'Error Text':('error', '09'),
- 'Shell Normal Text':('console', '10'),
- 'Shell Stdout Text':('stdout', '11'),
- 'Shell Stderr Text':('stderr', '12'),
+ 'Normal Text': ('normal', '00'),
+ 'Python Keywords': ('keyword', '01'),
+ 'Python Definitions': ('definition', '02'),
+ 'Python Builtins': ('builtin', '03'),
+ 'Python Comments': ('comment', '04'),
+ 'Python Strings': ('string', '05'),
+ 'Selected Text': ('hilite', '06'),
+ 'Found Text': ('hit', '07'),
+ 'Cursor': ('cursor', '08'),
+ 'Editor Breakpoint': ('break', '09'),
+ 'Shell Normal Text': ('console', '10'),
+ 'Shell Error Text': ('error', '11'),
+ 'Shell Stdout Text': ('stdout', '12'),
+ 'Shell Stderr Text': ('stderr', '13'),
}
self.ResetChangedItems() #load initial values in changed items dict
self.CreateWidgets()
@@ -219,7 +220,8 @@
("'selected'", 'hilite'), ('\n var2 = ', 'normal'),
("'found'", 'hit'), ('\n var3 = ', 'normal'),
('list', 'builtin'), ('(', 'normal'),
- ('None', 'keyword'), (')\n\n', 'normal'),
+ ('None', 'keyword'), (')\n', 'normal'),
+ (' breakpoint("line")', 'break'), ('\n\n', 'normal'),
(' error ', 'error'), (' ', 'normal'),
('cursor |', 'cursor'), ('\n ', 'normal'),
('shell', 'console'), (' ', 'normal'),
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list