Index: /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fck_othercommands.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fck_othercommands.js	(revision 2117)
+++ /FCKeditor/branches/features/div_container/editor/_source/commandclasses/fck_othercommands.js	(revision 2118)
@@ -517,2 +517,41 @@
 	}
 };
+
+var FCKDeleteDivCommand = function()
+{
+}
+FCKDeleteDivCommand.prototype = 
+{
+	GetState : function()
+	{
+		if ( FCK.EditMode != FCK_EDITMODE_WYSIWYG )
+			return FCK_TRISTATE_DISABLED ;
+
+		var node = FCKSelection.GetParentElement() ;
+		var path = new FCKElementPath( node ) ;
+		return path.BlockLimit && path.BlockLimit.nodeName.IEquals( 'div' ) ? FCK_TRISTATE_OFF : FCK_TRISTATE_DISABLED ;
+	},
+
+	Execute : function()
+	{
+		// Create an undo snapshot before doing anything.
+		FCKUndo.SaveUndoStep() ;
+
+		// Find out the node to delete.
+		var node = FCKSelection.GetParentElement() ;
+		var path = new FCKElementPath( node ) ;
+		node = path.BlockLimit ;
+		
+		// Remember the current selection position.
+		var range = new FCKDomRange( FCK.EditorWindow ) ;
+		range.MoveToSelection() ;
+		var bookmark = range.CreateBookmark() ;
+
+		// Delete the container DIV node.
+		FCKDomTools.RemoveNode( node, true ) ;
+
+		// Restore selection.
+		range.MoveToBookmark( bookmark ) ;
+		range.Select() ;
+	}
+} ;
Index: /FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js	(revision 2117)
+++ /FCKeditor/branches/features/div_container/editor/_source/internals/fck_contextmenu.js	(revision 2118)
@@ -303,4 +303,5 @@
 					menu.AddSeparator() ;
 					menu.AddItem( 'EditDiv', FCKLang.EditDiv, 73 ) ;
+					menu.AddItem( 'DeleteDiv', FCKLang.DeleteDiv, 73 ) ;
 				}
 			}} ;
Index: /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js	(revision 2117)
+++ /FCKeditor/branches/features/div_container/editor/_source/internals/fckcommands.js	(revision 2118)
@@ -97,4 +97,5 @@
 		case 'CreateDiv'	: oCommand = new FCKDialogCommand( 'CreateDiv', FCKLang.CreateDiv, 'dialog/fck_div.html', 380, 210, null, null, true ) ; break ;
 		case 'EditDiv'		: oCommand = new FCKDialogCommand( 'EditDiv', FCKLang.EditDiv, 'dialog/fck_div.html', 380, 210, null, null, false ) ; break ;
+		case 'DeleteDiv'	: oCommand = new FCKDeleteDivCommand() ; break ;
 
 		case 'TableInsertRowAfter'		: oCommand = new FCKTableCommand('TableInsertRowAfter') ; break ;
Index: /FCKeditor/branches/features/div_container/editor/lang/en.js
===================================================================
--- /FCKeditor/branches/features/div_container/editor/lang/en.js	(revision 2117)
+++ /FCKeditor/branches/features/div_container/editor/lang/en.js	(revision 2118)
@@ -75,4 +75,5 @@
 CreateDiv			: "Create DIV Container",
 EditDiv				: "Edit DIV Container",
+DeleteDiv			: "Remove DIV Container",
 Undo				: "Undo",
 Redo				: "Redo",