cvs -z9 diff -u -F^function -- tinymce.module (in directory C:\devroot\cvs-drupal\contributions\modules\tinymce\)
Index: tinymce.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tinymce/tinymce.module,v
retrieving revision 1.90
diff -u -F^function -r1.90 tinymce.module
--- tinymce.module	25 Apr 2006 11:23:47 -0000	1.90
+++ tinymce.module	30 Dec 2006 17:40:19 -0000
@@ -498,6 +498,8 @@ function tinymce_config($profile) {
   $init['verify_html']        = $settings['verify_html'] ? $settings['verify_html'] : 'false';
   $init['preformatted']       = $settings['preformatted'] ? $settings['preformatted'] : 'false';
   $init['convert_fonts_to_styles'] = $settings['convert_fonts_to_styles'] ? $settings['convert_fonts_to_styles'] : 'false';
+  $init['convert_newlines_to_brs'] = $settings['convert_newlines'] ? $settings['convert_newlines'] : 'false';
+  $init['remove_linebreaks'] = $settings['remove_linebreaks'] ? $settings['remove_linebreaks'] : 'true';
 
   $tinymce_mod_path = drupal_get_path('module', 'tinymce');
   if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/imagemanager/') && user_access('access tinymce imagemanager')) {
@@ -893,5 +895,20 @@ function tinymce_profile_form($edit) {
     '#description' => t('If this option is set to true, the editor will insert TAB characters on tab and preserve other whitespace characters just like a PRE HTML element does.')
   );
   
+  $form['output']['remove_linebreaks'] = array(
+    '#type' => 'select',
+    '#title' => t('Remove linebreaks'),
+    '#default_value' => $edit->settings['remove_linebreaks'],
+    '#options' => array('true' => 'true', 'false' => 'false'),
+    '#description' => t('This option controls if linebreak characters should be removed from output HTML or not. This option is enabled by default since many backend systems use newline to convertion since they used to be plain old textarea based. With this option enables all HTML content will be placed on one line.')
+    );
+  $form['output']['convert_newlines'] = array(
+    '#type' => 'select',
+    '#title' => t('Convert new lines to BRs'),
+    '#default_value' => $edit->settings['convert_newlines'],
+    '#options' => array('true' => 'true', 'false' => 'false'),
+    '#description' => t('If you set this option to true newline characters codes gets converted in to br elements. This option is set to false by default.')
+);
+ 
   $form['output']['convert_fonts_to_styles'] = array(
     '#type' => 'select', 
     '#title' => t('Convert <font> tags to styles'),