From 67ac0792037349b01ab2193ea9a057ffc420239e Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Thu, 29 Mar 2012 19:01:28 +0300
Subject: Issue #14409: IDLE doesn't not execute commands from shell with
 default keybinding for <Return>.

Patch by Roger Serwy.
---
 Lib/idlelib/NEWS.txt         | 3 +++
 Lib/idlelib/configHandler.py | 2 +-
 Misc/NEWS                    | 3 +++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 4482be2..f7fbe45 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,6 +1,9 @@
 What's New in IDLE 3.2.3?
 =========================
 
+- Issue #14409: IDLE doesn't not execute commands from shell,
+  error with default keybinding for Return. (Patch by Roger Serwy)
+
 - Issue #3573: IDLE hangs when passing invalid command line args
   (directory(ies) instead of file(s)).
 
diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
index 73b8db5..da92726 100644
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -595,7 +595,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>'],
diff --git a/Misc/NEWS b/Misc/NEWS
index e3b110d..f4a2d03 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -31,6 +31,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #14409: IDLE doesn't not execute commands from shell,
+  error with default keybinding for Return. (Patch by Roger Serwy)
+
 - Issue #10340: asyncore - properly handle EINVAL in dispatcher constructor on
   OSX; avoid to call handle_connect in case of a disconnected socket which
   was not meant to connect.
-- 
cgit v0.12