Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 5285)
+++ /CKEditor/trunk/CHANGES.html	(revision 5286)
@@ -47,4 +47,5 @@
 					Now the configuration entry is named 'config.stylesSet' instead of config.stylesCombo_stylesSet and the default location 
 					is under the 'styles' plugin instead of 'stylescombo'.</li>
+		<li><a href="http://dev.fckeditor.net/ticket/5302">#5302</a> : Adding config option 'CKEDITOR.config.forceEnterMode'.</li>
 	</ul>
 	<p>
Index: /CKEditor/trunk/_source/core/config.js
===================================================================
--- /CKEditor/trunk/_source/core/config.js	(revision 5285)
+++ /CKEditor/trunk/_source/core/config.js	(revision 5286)
@@ -1,3 +1,3 @@
-/*
+/*
 Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
 For licensing, see LICENSE.html or http://ckeditor.com/license
@@ -131,4 +131,16 @@
 
 	/**
+	 * Force the respect of {@link CKEDITOR.config.enterMode} as line break regardless of the context,
+	 * E.g. If {@link CKEDITOR.config.enterMode} is set to {@link CKEDITOR.ENTER_P},
+	 * press enter key inside a 'div' will create a new paragraph with 'p' instead of 'div'.
+	 * @since 3.2.1
+	 * @default false
+	 * @example
+	 * // Not recommended.
+	 * config.forceEnterMode = true;
+	 */
+	forceEnterMode : false,
+
+	/**
 	 * Just like the {@link CKEDITOR.config.enterMode} setting, it defines the behavior for the SHIFT+ENTER key.
 	 * The allowed values are the following constants, and their relative
Index: /CKEditor/trunk/_source/plugins/enterkey/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/enterkey/plugin.js	(revision 5285)
+++ /CKEditor/trunk/_source/plugins/enterkey/plugin.js	(revision 5286)
@@ -292,4 +292,6 @@
 	function enter( editor, mode, forceMode )
 	{
+		forceMode = editor.config.forceEnterMode || forceMode;
+
 		// Only effective within document.
 		if ( editor.mode != 'wysiwyg' )