Ticket #5018: 5018_3.patch

_source/plugins/styles/plugin.js

@@ -937 +937 @@
                 for ( var attName in attributes )
                 {
                         // The 'class' element value must match (#1318).
-                        if ( attName == 'class' && element.getAttribute( attName ) != attributes[ attName ] )
+                        if ( ( attName == 'class' || style._.definition.unique ) && element.getAttribute( attName ) != attributes[ attName ] )
                                 continue;
                         removeEmpty = element.hasAttribute( attName );
                         element.removeAttribute( attName );
@@ -945 +945 @@
 
                 for ( var styleName in styles )
                 {
+                        // Unique style insist on having full match. (#5018)
+                        if ( style._.definition.unique
+                                        && element.getStyle( styleName ) != styles[ styleName ] )
+                                continue;
+
                         removeEmpty = removeEmpty || !!element.getStyle( styleName );
                         element.removeStyle( styleName );
                 }

_source/plugins/find/dialogs/find.js

@@ -67 +67 @@
 
         var findDialog = function( editor, startupPage )
         {
-                // Style object for highlights.
-                var highlightStyle = new CKEDITOR.style( editor.config.find_highlight );
+                // Style object for highlights, must be defined as unique style to avoid conflicting with ordinary text color styles. (#5018)
+                var highlightStyle = new CKEDITOR.style( CKEDITOR.tools.extend( { unique : true },
+                        editor.config.find_highlight ) );
 
                 /**
                  * Iterator which walk through the specified range char by char. By