summaryrefslogtreecommitdiff
path: root/Lib/idlelib/configHandler.py
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-29 19:50:46 +0300
committerAndrew Svetlov <andrew.svetlov@gmail.com>2012-03-29 19:50:46 +0300
commitd3cebd790de921f8797744822cdaab5e3f02db9f (patch)
tree9ff87f2a77c55e550a91d33eaf9bc9a35abffcb3 /Lib/idlelib/configHandler.py
parent86407432d5a386bce927377114c4edc3ce254b52 (diff)
parent67ac0792037349b01ab2193ea9a057ffc420239e (diff)
downloadcpython-git-d3cebd790de921f8797744822cdaab5e3f02db9f.tar.gz
Merge with 3.2
Diffstat (limited to 'Lib/idlelib/configHandler.py')
-rw-r--r--Lib/idlelib/configHandler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
index 79315ef63b..4049004873 100644
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -596,7 +596,7 @@ class IdleConf:
'<<replace>>': ['<Control-h>'],
'<<goto-line>>': ['<Alt-g>'],
'<<smart-backspace>>': ['<Key-BackSpace>'],
- '<<newline-and-indent>>': ['<Key-Return> <Key-KP_Enter>'],
+ '<<newline-and-indent>>': ['<Key-Return>', '<Key-KP_Enter>'],
'<<smart-indent>>': ['<Key-Tab>'],
'<<indent-region>>': ['<Control-Key-bracketright>'],
'<<dedent-region>>': ['<Control-Key-bracketleft>'],