? 170583.patch
? includes/table.inc
Index: commands/core/watchdog.drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/commands/core/watchdog.drush.inc,v
retrieving revision 1.5
diff -u -r1.5 watchdog.drush.inc
--- commands/core/watchdog.drush.inc	23 Feb 2010 03:30:45 -0000	1.5
+++ commands/core/watchdog.drush.inc	23 Feb 2010 09:34:11 -0000
@@ -68,12 +68,12 @@
  * Command callback.
  */
 function drush_core_watchdog_list() {
-  $options['-'] = dt('== message types ==');
+  $options['-- types --'] = dt('== message types ==');
   $types = core_watchdog_message_types();
   foreach ($types as $type) {
     $options[] = $type;
   }
-  $options['--'] = dt('== severity levels ==');
+  $options['-- levels --'] = dt('== severity levels ==');
   $severities = core_watchdog_severity_levels();
   foreach ($severities as $key => $value) {
     $options[] = "$value($key)";
Index: includes/drush.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/drush/includes/drush.inc,v
retrieving revision 1.89
diff -u -r1.89 drush.inc
--- includes/drush.inc	23 Feb 2010 03:30:45 -0000	1.89
+++ includes/drush.inc	23 Feb 2010 09:34:12 -0000
@@ -725,9 +725,9 @@
  *   A list of questions to display to the user.  The
  *   KEYS of the array are the result codes to return to the
  *   caller; the VALUES are the messages to display on
- *   each line. Special keys starting with '-' can be provided
- *   as separator between choices groups. Separator keys don't alter
- *   the numbering.
+ *   each line. Special keys of the form '-- something --' can be 
+ *   provided as separator between choices groups. Separator keys 
+ *    don't alter the numbering.
  * @param $prompt
  *   The message to display to the user prompting for input.
  * @param $label
@@ -745,7 +745,7 @@
   drush_print('  [0] : Cancel');
   $selection_number = 0;
   foreach ($options as $key => $option) {
-    if (strpos($key, '-') === 0) {
+    if ((substr($key, 0, 3) == '-- ') && (substr($key, -3) == ' --')) {
       drush_print("  ".$option);
       continue;
     }
