From: Ned Deily <nad@acm.org>
Date: Sat, 29 Jan 2011 19:22:26 +0000 (+0000)
Subject: Merged revisions 88236 via svnmerge from
X-Git-Tag: v3.2.1b1~347^2~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=26d55edc2f7e70cca6886ecadebf7e5f11950b83;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 88236 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r88236 | ned.deily | 2011-01-29 11:10:26 -0800 (Sat, 29 Jan 2011) | 3 lines

  Issue 11052: Correct IDLE menu accelerators on Mac OS X for Save
  commands.  (with release manager approval for 3.2rc2)
........
---

diff --git a/Lib/idlelib/config-keys.def b/Lib/idlelib/config-keys.def
index fb0aaf4dc156..fdc35ba7b5ac 100644
--- a/Lib/idlelib/config-keys.def
+++ b/Lib/idlelib/config-keys.def
@@ -176,7 +176,7 @@ comment-region = <Control-Key-3>
 redo = <Shift-Command-Key-Z>
 close-window = <Command-Key-w>
 restart-shell = <Control-Key-F6>
-save-window-as-file = <Command-Key-S>
+save-window-as-file = <Shift-Command-Key-S>
 close-all-windows = <Command-Key-q>
 view-restart = <Key-F6>
 tabify-region = <Control-Key-5>
@@ -208,7 +208,7 @@ open-new-window = <Command-Key-n>
 open-module = <Command-Key-m>
 find-selection = <Shift-Command-Key-F3>
 python-context-help = <Shift-Key-F1>
-save-copy-of-window-as-file = <Shift-Command-Key-s>
+save-copy-of-window-as-file = <Option-Command-Key-s>
 open-window-from-file = <Command-Key-o>
 python-docs = <Key-F1>
 
diff --git a/Misc/NEWS b/Misc/NEWS
index bfe7991ff065..5f0acc3c4aa7 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save
+  commands.
+
 - Issue #11020: Command-line pyclbr was broken because of missing 2-to-3
   conversion.