Ticket #6604: 6604.patch

_source/plugins/indent/plugin.js

@@ -215 +215 @@
                                 iterator.enforceRealBlocks = true;
                                 iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
                                 var block;
-                                while ( ( block = iterator.getNextParagraph() ) )
+                                while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
                                         indentElement( block );
                         }
 

_source/plugins/justify/plugin.js

@@ -159 +159 @@
                                 iterator = ranges[ i ].createIterator();
                                 iterator.enlargeBr = enterMode != CKEDITOR.ENTER_BR;
 
-                                while ( ( block = iterator.getNextParagraph() ) )
+                                while ( ( block = iterator.getNextParagraph( enterMode == CKEDITOR.ENTER_P ? 'p' : 'div' ) ) )
                                 {
                                         block.removeAttribute( 'align' );
                                         block.removeStyle( 'text-align' );