Ticket #5191: 5191.patch

_source/plugins/undo/plugin.js

@@ -343 +343 @@
                 /**
                  * Save a snapshot of document image for later retrieve.
                  */
-                save : function( onContentOnly, image, autoFireChange )
+                save : function( onContentOnly, image, autoFireChange, forRedo )
                 {
-                        var snapshots = this.snapshots;
+                        var snapshots = this.snapshots,
+                                nextImage;
 
                         // Get a content image.
                         if ( !image )
@@ -359 +360 @@
                         if ( this.currentImage && image.equals( this.currentImage, onContentOnly ) )
                                 return false;
 
+                        // If we are saving for a redo, the current code might have been automatically adjusted
+                        // but the stored image doesn't reflect that in the currentImage, but on the next one. #5191
+                        if ( !!forRedo && ((nextImage = this.getNextImage( false )) && image.equals( nextImage, onContentOnly )))
+                                return false;
+
                         // Drop future snapshots.
                         snapshots.splice( this.index + 1, snapshots.length - this.index - 1 );
 
@@ -485 +491 @@
                         {
                                 // Try to save. If no changes have been made, the redo stack
                                 // will not change, so it will still be redoable.
-                                this.save( true );
+                                this.save( true, null, false, true );
 
                                 // If instead we had changes, we can't redo anymore.
                                 if ( this.redoable() )