=== modified file 'modules/comment/comment.module'
--- modules/comment/comment.module      2008-11-17 13:45:31 +0000
+++ modules/comment/comment.module      2008-11-18 15:19:44 +0000
@@ -434,6 +434,17 @@
     case 'search result':
       $comments = db_result(db_query('SELECT comment_count FROM {node_comment_statistics} WHERE nid = %d', $node->nid));
       return format_plural($comments, '1 comment', '@count comments');
+
+    case 'rss item':
+      if (variable_get('comment_feed_element', 1) &&
+          $node->comment != COMMENT_NODE_DISABLED) {
+        return array(array('key' => 'comments',
+                           'value' => url('node/'. $node->nid,
+                                          NULL, 'comments', TRUE)));
+      }
+      else {
+        return array();
+      }
   }
 }
 
@@ -552,6 +563,20 @@
     '#options' => array(t('Display on separate page'), t('Display below post or comments')),
   );
 
+  $form['feed_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Feed settings'),
+    '#collapsible' => TRUE,
+  );
+
+  $form['feed_settings']['comment_feed_element'] = array(
+    '#type' => 'radios',
+    '#title' => t('Publish pointer to comments in feeds?'),
+    '#default_value' => variable_get('comment_feed_element', 1),
+    '#options' => array(1 => t('Include pointer'),
+                        0 => t('Don't publish')),
+  );
+
   return system_settings_form($form);
 }