Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 3846)
+++ /CKEditor/trunk/CHANGES.html	(revision 3847)
@@ -1,3 +1,3 @@
-﻿﻿﻿﻿﻿﻿﻿﻿﻿﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+﻿﻿﻿﻿﻿﻿﻿<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!--
 Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
@@ -45,6 +45,4 @@
 		Fixed issues:</p>
 	<ul>
-		<li><a href="http://dev.fckeditor.net/ticket/3642">#3642</a> : Fixed file type form field layout</li>
-		<li><a href="http://dev.fckeditor.net/ticket/3869">#3869</a> : Now it is possible to insert protected source inside another one</li>
 		<li><a href="http://dev.fckeditor.net/ticket/3859">#3859</a> : Fixed Flash dialog layout in Webkit</li>
 		<li><a href="http://dev.fckeditor.net/ticket/3852">#3852</a> : Disabled textarea resizing in dialogs</li>
Index: /CKEditor/trunk/_source/plugins/editingblock/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/editingblock/plugin.js	(revision 3846)
+++ /CKEditor/trunk/_source/plugins/editingblock/plugin.js	(revision 3847)
@@ -170,7 +170,8 @@
 				return;
 
+			this.fire( 'beforeModeUnload' );
+
 			var currentMode = getMode( this );
 			data = currentMode.getData();
-			data = this.fire( 'beforeModeUnload', data );
 			currentMode.unload( holderElement );
 			this.mode = '';
Index: /CKEditor/trunk/_source/plugins/undo/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/undo/plugin.js	(revision 3846)
+++ /CKEditor/trunk/_source/plugins/undo/plugin.js	(revision 3847)
@@ -72,20 +72,19 @@
 			// Registering keydown on every document recreation.(#3844)
 			editor.on( 'contentDom', function()
-			{
-				editor.document.on( 'keydown', function( event )
-					{
-						// Do not capture CTRL hotkeys.
-						if ( !event.data.$.ctrlKey && !event.data.$.metaKey )
-							undoManager.type( event );
-					});
-
-			} );
+				{
+					editor.document.on( 'keydown', function( event )
+						{
+							// Do not capture CTRL hotkeys.
+							if ( !event.data.$.ctrlKey && !event.data.$.metaKey )
+								undoManager.type( event );
+						});
+				});
 
 			// Always save an undo snapshot - the previous mode might have
 			// changed editor contents.
 			editor.on( 'beforeModeUnload', function()
-			{
-				editor.mode == 'wysiwyg' && undoManager.save( true );
-			} );
+				{
+					editor.mode == 'wysiwyg' && undoManager.save( true );
+				});
 
 			// Make the undo manager available only in wysiwyg mode.
