--- moin-1.5.4/MoinMoin/parser/wiki.py.orig	2006-05-11 11:24:00.000000000 -0500
+++ moin-1.5.4/MoinMoin/parser/wiki.py	2006-07-31 14:37:28.000000000 -0500
@@ -461,15 +461,7 @@
     
     def _indent_repl(self, match):
         """Handle pure indentation (no - * 1. markup)."""
-        result = []
-        if not (self.in_li or self.in_dd):
-            self._close_item(result)
-            self.in_li = 1
-            css_class = None
-            if self.line_was_empty and not self.first_list_item:
-                css_class = 'gap'
-            result.append(self.formatter.listitem(1, css_class=css_class, style="list-style-type:none"))
-        return ''.join(result)
+        return ""
 
     def _li_none_repl(self, match):
         """Handle type=none (" .") lists."""
@@ -545,7 +537,7 @@
                     self.in_li = 1
                 
         # Open new list, if necessary
-        if self._indent_level() < new_level:
+        if list_type and self._indent_level() < new_level:
             self.list_indents.append(new_level)
             self.list_types.append(list_type)
 
@@ -879,7 +871,7 @@
         ###result.append('<span class="info">[no match, add rest: <tt>"%s"<tt>]</span>' % line[lastpos:])
         
         # Add paragraph with the remainder of the line
-        if not (self.in_pre or self.in_li or self.in_dd or self.inhibit_p or
+        if not (self.in_pre or self.inhibit_p or
                 self.formatter.in_p) and lastpos < len(line):
             result.append(self.formatter.paragraph(1, css_class="line874"))
         result.append(self.formatter.text(line[lastpos:]))
@@ -937,6 +929,7 @@
         self.request.clock.start('compile_huge_and_ugly')        
         scan_re = re.compile(rules, re.UNICODE)
         number_re = re.compile(self.ol_rule, re.UNICODE)
+        bullet_re = re.compile("^\s+[*.]\s", re.UNICODE)
         term_re = re.compile(self.dl_rule, re.UNICODE)
         indent_re = re.compile("^\s*", re.UNICODE)
         eol_re = re.compile(r'\r?\n', re.UNICODE)
@@ -1043,7 +1036,7 @@
                 # Check indent level
                 indent = indent_re.match(line)
                 indlen = len(indent.group(0))
-                indtype = "ul"
+                indtype = None
                 numtype = None
                 numstart = None
                 if indlen:
@@ -1058,6 +1051,8 @@
                             numstart = None
 
                         indtype = "ol"
+                    elif bullet_re.match(line):
+                        indtype = "ul"
                     else:
                         match = term_re.match(line)
                         if match: