X-Git-Url: https://jasonwoof.com/gitweb/?p=ckeditor.git;a=blobdiff_plain;f=_source%2Fplugins%2Fformat%2Fplugin.js;h=b28e4c832cae2669ef14ad3d83e88cc44354d3cc;hp=9c7c1e38d7d95c660f7111725ad6fffcc346c22a;hb=941b0a9ba4e673e292510d80a5a86806994b8ea6;hpb=ea7e3453c7b0f023b050aca6d9f83ab372860d91

diff --git a/_source/plugins/format/plugin.js b/_source/plugins/format/plugin.js
index 9c7c1e3..b28e4c8 100644
--- a/_source/plugins/format/plugin.js
+++ b/_source/plugins/format/plugin.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
 */
 
@@ -33,7 +33,7 @@ CKEDITOR.plugins.add( 'format',
 
 				panel :
 				{
-					css : [ config.contentsCss, CKEDITOR.getUrl( editor.skinPath + 'editor.css' ) ],
+					css : editor.skin.editor.css.concat( config.contentsCss ),
 					voiceLabel : lang.panelVoiceLabel
 				},
 
@@ -57,7 +57,11 @@ CKEDITOR.plugins.add( 'format',
 
 					styles[ value ].apply( editor.document );
 
-					editor.fire( 'saveSnapshot' );
+					// Save the undo snapshot after all changes are affected. (#4899)
+					setTimeout( function()
+					{
+						editor.fire( 'saveSnapshot' );
+					}, 0 );
 				},
 
 				onRender : function()