Ticket #5121: 5121_5.patch

_source/plugins/format/plugin.js

@@ -21 +21 @@
                 {
                         var tag = tags[ i ];
                         styles[ tag ] = new CKEDITOR.style( config[ 'format_' + tag ] );
+                        styles[ tag ]._.enterMode = editor.config.enterMode;
                 }
 
                 editor.ui.addRichCombo( 'Format',

_source/plugins/styles/plugin.js

@@ -752 +752 @@
 
                 var iterator = range.createIterator();
                 iterator.enforceRealBlocks = true;
+                
+                // make recognize <br /> tag as a separator in ENTER_BR mode (#5121)
+                if ( this._.enterMode ) 
+                        iterator.enlargeBr = ( this._.enterMode != CKEDITOR.ENTER_BR );
 
                 var block;
                 var doc = range.document;

_source/plugins/stylescombo/plugin.js

@@ -34 +34 @@
 
                                                         style = styles[ styleName ] = new CKEDITOR.style( styleDefinition );
                                                         style._name = styleName;
+                                                        style._.enterMode = config.enterMode;
 
                                                         stylesList.push( style );
                                                 }