Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 342)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 343)
@@ -40,4 +40,11 @@
 		<li>It is now possible to set the default target when creating links, with the new "<strong>DefaultLinkTarget</strong>"
 			setting. </li>
+		<li>The new "<strong>FirefoxSpellChecker</strong>" setting is available, to enable/disable
+			the Firefox built-in spellchecker while typing. Even if word suggestions will not
+			appear in the FCKeditor context menu, this feature is useful to quickly identify
+			misspelled words.</li>
+		<li>The new "<strong>BrowserContextMenuOnCtrl</strong>" settings is being introduced,
+			to enable/disable the ability of displaying the default browser's context menu when
+			right-clicking with the CTRL key pressed.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js
===================================================================
--- /FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js	(revision 342)
+++ /FCKeditor/trunk/editor/_source/classes/fckcontextmenu.js	(revision 343)
@@ -24,4 +24,6 @@
 var FCKContextMenu = function( parentWindow, langDir )
 {
+	this.CtrlDisable = false ;
+
 	var oPanel = this._Panel = new FCKPanel( parentWindow ) ;
 	oPanel.AppendStyleSheet( FCKConfig.SkinPath + 'fck_editor.css' ) ;
@@ -88,4 +90,7 @@
 		if ( el._FCKContextMenu )
 		{
+			if ( el._FCKContextMenu.CtrlDisable && ( e.ctrlKey || e.metaKey ) )
+				return true ;
+
 			FCKTools.CancelEvent( e ) ;
 			FCKContextMenu_AttachedElement_OnContextMenu( e, el._FCKContextMenu, el ) ;
@@ -101,4 +106,7 @@
 //	if ( iButton != 2 )
 //		return ;
+
+	if ( fckContextMenu.CtrlDisable && ( ev.ctrlKey || ev.metaKey ) )
+		return true ;
 
 	var eTarget = el || this ;
Index: /FCKeditor/trunk/editor/_source/internals/fck.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck.js	(revision 342)
+++ /FCKeditor/trunk/editor/_source/internals/fck.js	(revision 343)
@@ -94,5 +94,5 @@
 
 		this.EditingArea = new FCKEditingArea( document.getElementById( 'xEditingArea' ) ) ;
-		this.EditingArea.FFSpellChecker = false ;
+		this.EditingArea.FFSpellChecker = FCKConfig.FirefoxSpellChecker ;
 
 		// Final setup of the lists lib.
Index: /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js
===================================================================
--- /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js	(revision 342)
+++ /FCKeditor/trunk/editor/_source/internals/fck_contextmenu.js	(revision 343)
@@ -35,4 +35,5 @@
 {
 	var oInnerContextMenu = FCK.ContextMenu._InnerContextMenu = new FCKContextMenu( FCKBrowserInfo.IsIE ? window : window.parent, FCKLang.Dir ) ;
+	oInnerContextMenu.CtrlDisable	= FCKConfig.BrowserContextMenuOnCtrl ;
 	oInnerContextMenu.OnBeforeOpen	= FCK_ContextMenu_OnBeforeOpen ;
 	oInnerContextMenu.OnItemClick	= FCK_ContextMenu_OnItemClick ;
Index: /FCKeditor/trunk/fckconfig.js
===================================================================
--- /FCKeditor/trunk/fckconfig.js	(revision 342)
+++ /FCKeditor/trunk/fckconfig.js	(revision 343)
@@ -137,4 +137,5 @@
 
 FCKConfig.ContextMenu = ['Generic','Link','Anchor','Image','Flash','Select','Textarea','Checkbox','Radio','TextField','HiddenField','ImageButton','Button','BulletedList','NumberedList','Table','Form'] ;
+FCKConfig.BrowserContextMenuOnCtrl = false ;
 
 FCKConfig.FontColors = '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,808080,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF' ;
@@ -150,4 +151,5 @@
 FCKConfig.IeSpellDownloadUrl	= 'http://www.iespell.com/download.php' ;
 FCKConfig.SpellerPagesServerScript = 'server-scripts/spellchecker.php' ;	// Available extension: .php .cfm .pl
+FCKConfig.FirefoxSpellChecker	= false ;
 
 FCKConfig.MaxUndoLevels = 15 ;
