Index: tinymce.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/tinymce/tinymce.module,v
retrieving revision 1.90
diff -u -F^f -r1.90 tinymce.module
--- tinymce.module	25 Apr 2006 11:23:47 -0000	1.90
+++ tinymce.module	15 Sep 2006 16:54:20 -0000
@@ -595,6 +595,16 @@ function tinymce_config($profile) {
       }
 
     }
+ 
+    if (strlen($settings['button_override'])) {
+	    $override = explode("\n", $settings['button_override']);
+	    for ($i=0; $i< count($override); $i++) {
+	      $init['theme_advanced_buttons'.($i+1)] = str_replace("\r", "", $override[$i]);
+	    }
+    }
+    
+    if ($settings['entity_encoding'] == 'numeric' || $settings['entity_encoding'] == 'raw')
+      $init['entity_encoding'] = $settings['entity_encoding'];
   }
 
   if ($settings['css_classes']) $init['theme_advanced_styles'] = $settings['css_classes'];
@@ -901,6 +911,15 @@ function tinymce_profile_form($edit) {
     '#description' => t('If you set this option to true, font size, font family, font color and font background color will be replaced by inline styles.')
   );
 
+  
+  $form['output']['entity_encoding'] = array(
+    '#type' => 'select',
+    '#title' => 'Entity Encoding',
+    '#default_value' => $edit->settings['entity_encoding'],
+    '#options' => array('named' => "Named ('&nbsp;')", 'numeric' => "Numeric ('&#160;')", 'raw' => "Raw (' ')"),
+    '#description' => t('How special characters should be converted to HTML entities.')
+  );
+
   $form['css'] = array(
     '#type' => 'fieldset', 
     '#title' => t('CSS'), 
@@ -934,6 +953,20 @@ function tinymce_profile_form($edit) {
     '#description' => t('Adds CSS classes to the "styles" droplist. Format is: &lt;title&gt;=&lt;class&gt;;<br/> Example: Header 1=header1;Header 2=header2;Header 3=header3 (note: no trailing \';\')<br />Leave blank to automatically import list of CSS classes from style sheet.')
   );
 
+  $form['advanced'] = array(
+    '#type' => 'fieldset', 
+    '#title' => t('Advanced'), 
+    '#collapsible' => TRUE, 
+    '#collapsed' => TRUE
+  );
+  
+  $form['advanced']['button_override'] = array(
+    '#type' => 'textarea',
+    '#title' => 'Button Override',
+    '#default_value' => $edit->settings['button_override'],
+    '#description' => t('Overrides the layout of buttons. Each line is a separate row in the editor, a comma-delimited list of buttons.')
+  );
+
   $form['submit'] = array(
     '#type' => 'submit', 
     '#value' => $btn