MERGE DS_RPC_BRANCH into MAIN:

config-keys.def
    AutoIndent merged 21Jul

diff --git a/Lib/idlelib/config-keys.def b/Lib/idlelib/config-keys.def
index 180d70e4251b0367482935866e2bef02b7e9dba6..ff9da212d07ffc1f6bf303600910c95569e72a5d 100644 (file)
--- a/Lib/idlelib/config-keys.def
+++ b/Lib/idlelib/config-keys.def
@@ -41,6 +41,17 @@ find-in-files=<Alt-Key-F3>
 find-selection=<Control-Key-F3>
 replace=<Control-Key-h>
 goto-line=<Alt-Key-g>
+smart-backspace=<Key-BackSpace>
+newline-and-indent=<Key-Return> <Key-KP_Enter>
+smart-indent=<Key-Tab>
+indent-region=<Control-Key-bracketright>
+dedent-region=<Control-Key-bracketleft>
+comment-region=<Alt-Key-3>
+uncomment-region=<Alt-Key-4>
+tabify-region=<Alt-Key-5>
+untabify-region=<Alt-Key-6>
+toggle-tabs=<Alt-Key-t>
+change-indentwidth=<Alt-Key-u>
 
 [IDLE Classic Unix]
 copy=<Alt-Key-w> <Meta-Key-w>
@@ -77,3 +88,14 @@ find-in-files=<Alt-Key-s> <Meta-Key-s>
 find-selection=<Control-Key-s>
 replace=<Control-Key-r>
 goto-line=<Alt-Key-g> <Meta-Key-g>
+smart-backspace=<Key-BackSpace>
+newline-and-indent=<Key-Return> <Key-KP_Enter>
+smart-indent=<Key-Tab>
+indent-region=<Control-Key-bracketright>
+dedent-region=<Control-Key-bracketleft>
+comment-region=<Alt-Key-3>
+uncomment-region=<Alt-Key-4>
+tabify-region=<Alt-Key-5>
+untabify-region=<Alt-Key-6>
+toggle-tabs=<Alt-Key-t>
+change-indentwidth=<Alt-Key-u>