Ticket #5887: 5887.patch

_source/plugins/smiley/dialogs/smiley.js

@@ -8 +8 @@
         var config = editor.config,
                 lang = editor.lang.smiley,
                 images = config.smiley_images,
-                columns = 8,
+                columns = config.smiley_columns || 8,
                 i;
 
         /**

_source/plugins/smiley/plugin.js

@@ -82 +82 @@
                 'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
                 'yes', 'heart', 'broken heart', 'kiss', 'mail'
         ];
+
+/**
+ * The number of columns to be generated by the smilies matrix.
+ * @name CKEDITOR.config.smiley_columns
+ * @type Number
+ * @default 8
+ * @example
+ * config.smiley_columns = 6;
+ */
+ No newline at end of file