Index: taxonomy_defaults.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/taxonomy_defaults/Attic/taxonomy_defaults.admin.inc,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 taxonomy_defaults.admin.inc
--- taxonomy_defaults.admin.inc	8 Jan 2009 21:42:36 -0000	1.1.2.5
+++ taxonomy_defaults.admin.inc	11 Jul 2009 03:09:15 -0000
@@ -18,8 +18,24 @@ function taxonomy_defaults_form() {
         '#default_value' => variable_get("taxdef_{$type}_{$vid}_active", FALSE),
         '#weight' => -16,
       );
-      $form[$type][$vid]['name'] = array('#value' => t( $vocab->name ) );
-      $form[$type][$vid]['select'] = taxonomy_form($vid, variable_get("taxdef_{$type}_{$vid}", 0));
+      $form[$type][$vid]['name'] = array('#value' => t($vocab->name));
+      // If the vocabulary stores tags, add an autocomplete field for it.
+      if ($vocab->tags) {	 
+        $form[$type][$vid]['tags'] = array(
+          '#type' => 'textfield',	 
+          '#title' => $vocabulary->name,
+          '#description' => $help,
+          '#required' => $vocabulary->required,
+          '#default_value' => variable_get("taxdef_{$type}_{$vid}", ''),
+          '#autocomplete_path' => 'taxonomy/autocomplete/'. $vocabulary->vid,
+          '#weight' => $vocabulary->weight,
+          '#maxlength' => 255,
+        );	 
+      }
+      // Other vocabularies get added as normal selectors.
+      else {
+        $form[$type][$vid]['select'] = taxonomy_form($vid, variable_get("taxdef_{$type}_{$vid}", 0));
+      }
       $form[$type][$vid]['tip'] = array('#value' => $activevocab ? '' : '<p>'. t('The <strong>!vocab</strong> vocabulary is not enabled for the <strong>!type</strong> content type. Default terms will be added to the content without appearing on the add and edit pages.</p>', array('!vocab'=>$vocab->name, '!type'=>$name->name) ) );
     }
     if (count($vocabularies) > 0) {
@@ -79,7 +95,14 @@ function theme_taxonomy_defaults_form($f
 
       $vocabtable[$rowcount][] = drupal_render($form[$type][$key]['name']);
       $vocabtable[$rowcount][] = drupal_render($form[$type][$key]['active']);
-      $vocabtable[$rowcount][] = drupal_render($form[$type][$key]['select']);
+      // Add the term selector - tags autocomplete field.
+      if (isset($form[$type][$key]['tags'])) {
+        $vocabtable[$rowcount][] = drupal_render($form[$type][$key]['tags']);
+      }
+      // Add the term selector - standard selector.
+      else {
+        $vocabtable[$rowcount][] = drupal_render($form[$type][$key]['select']);
+      }
       $vocabtable[$rowcount][] = array( 'data' => drupal_render($form[$type][$key]['tip']) );
       $rowcount++;
     }