Ticket #27159: 27159.3.diff

src/wp-includes/class-wp-editor.php

@@ -839 +839 @@
                         'Formats' => _x( 'Formats', 'TinyMCE' ),
 
                         'Headings' => _x( 'Headings', 'TinyMCE' ),
+                        'Heading' => _x( 'Heading', 'TinyMCE' ),
                         'Heading 1' => array( __( 'Heading 1' ), 'access1' ),
                         'Heading 2' => array( __( 'Heading 2' ), 'access2' ),
                         'Heading 3' => array( __( 'Heading 3' ), 'access3' ),

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -578 +578 @@
                                         each( listbox.settings.values, function( item ) {
                                                 if ( item.text && labels.hasOwnProperty( item.text ) ) {
                                                         item.shortcut = '(' + labels[ item.text ] + ')';
+
+                                                        // Drop the numbers after the labels for headings.
+                                                        // TinyMCE makes previews for the h1-h6. It uses the same styles that are applied in the editor body.
+                                                        if ( item.text.indexOf( 'Heading' ) !== -1 ) {
+                                                                item.text = 'Heading';
+                                                        }
                                                 }
                                         } );
                                 }