Diff
Not logged in

Differences From:

File src/wikiformat.c part of check-in [083cad82ff] - rolled back my last commit for stripping P tags around UL/OL, which had broken logic. by stephan on 2009-12-08 10:10:04. Also file src/wikiformat.c part of check-in [6f0df6c741] - Fixed the insertion of invalid P tags inside of UL and OL elements when autoparagraph is on. Bug was reported on the fossil mailing list by Stephan Beal. by jeremy_c on 2009-12-07 20:20:22. [view]

To:

File src/wikiformat.c part of check-in [239139a907] - added second half of fix in #6f0df6c741 by stephan on 2009-12-07 22:29:33. [view]

@@ -850,9 +850,9 @@
 /*
 ** End a paragraph if we are in one.
 */
 static void endAutoParagraph(Renderer *p){
-  if( p->inAutoParagraph ){
+  if( p->inAutoParagraph && !(p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL)){
     popStackToTag(p, MARKUP_P);
     p->inAutoParagraph = 0;
   }
 }