Index: lib/editor/tinymce/tiny_mce_src.js
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/editor/tinymce/tiny_mce_src.js,v
retrieving revision 1.5
diff -u -p -r1.5 tiny_mce_src.js
--- lib/editor/tinymce/tiny_mce_src.js	28 Aug 2009 10:28:17 -0000	1.5
+++ lib/editor/tinymce/tiny_mce_src.js	5 Jan 2010 07:28:49 -0000
@@ -10080,11 +10080,16 @@ var tinyMCE = window.tinyMCE = tinymce.E
 				t.setContent(t.startContent, {format : 'raw'});
 			});
 
+			// coreplugin shortcut start
 			// Add shortcuts
 			if (s.custom_shortcuts) {
 				if (s.custom_undo_redo_keyboard_shortcuts) {
 					t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo');
 					t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo');
+					// Adding shortcuts Coreplugins 
+					// not finished yet
+					t.addShortcut('ctrl+alt+x', t.getLang('justifyleft_desc'), 'Align left');
+					// end of this comment
 				}
 
 				// Add default shortcuts for gecko
@@ -10101,6 +10106,7 @@ var tinyMCE = window.tinyMCE = tinymce.E
 				t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);
 				t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);
 				t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);
+                // coreplugin shortcut end
 
 				function find(e) {
 					var v = null;
@@ -11590,8 +11596,33 @@ var tinyMCE = window.tinyMCE = tinymce.E
 		},
 
 		setup : function() {
+		
 			var t = this, ed = t.editor, s = ed.settings;
 
+			// Adding additional Shortcuts added from Colin Brinckmann
+        
+            ed.addShortcut('ctrl+alt+a', 'forecolor', 'mceForeColor');
+            ed.addShortcut('ctrl+alt+b', 'emoticons', 'mceEmotion');
+            ed.addShortcut('ctrl+alt+c', 'backcolor', 'mceBackColor');
+            ed.addShortcut('ctrl+alt+d', 'charmap', 'mceCharMap');
+            ed.addShortcut('ctrl+alt+e', 'fullscreen', 'mceFullScreen');
+            ed.addShortcut('ctrl+alt+f', 'link', 'mceAdvLink');
+            ed.addShortcut('ctrl+alt+g', 'anchor', 'mceInsertAnchor');
+            ed.addShortcut('ctrl+alt+h', 'removeformat', 'RemoveFormat');
+            ed.addShortcut('ctrl+alt+i', 'unlink', 'UnLink');
+            ed.addShortcut('ctrl+alt+j', 'image', 'mceAdvImage');
+            ed.addShortcut('ctrl+alt+k', 'table', 'mceInsertTable');
+            ed.addShortcut('ctrl+alt+m', 'table.del', 'mceTableDelete');
+            ed.addShortcut('ctrl+alt+o', 'moodlenolink', 'mcemoodlenolink');					
+            ed.addShortcut('ctrl+alt+p', 'layer', 'mceInsertLayer');
+            ed.addShortcut('ctrl+alt+q', 'unsorted_list', 'UnsortedList');
+            ed.addShortcut('ctrl+alt+r', 'sorted_list', 'SortedList');
+            ed.addShortcut('ctrl+alt+s', 'dragmath', 'mceDragMath');
+            ed.addShortcut('ctrl+alt+t', 'visualaid', 'mceVisualChars');					
+            ed.addShortcut('ctrl+alt+u', 'autosave', 'mceTinyAutoSaveRestore');
+            ed.addShortcut('ctrl+alt+v', 'moodlemedia', 'mceMoodleMedia');
+            ed.addShortcut('ctrl+alt+w', 'Print', 'mcePrint');  
+
 			// Force root blocks when typing and when getting output
 			if (s.forced_root_block) {
 				ed.onKeyUp.add(t.forceRoots, t);