Diff
Not logged in

Differences From:

File src/wikiformat.c part of check-in [980b160bd0] - Disable the external link marking as it does not work on windows. by drh on 2009-11-02 13:19:44. [view]

To:

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]

@@ -839,9 +839,9 @@
 /*
 ** Begin a new paragraph if that something that is needed.
 */
 static void startAutoParagraph(Renderer *p){
-  if( p->wantAutoParagraph==0 ) return;
+  if( p->wantAutoParagraph==0 || p->wikiList==MARKUP_OL || p->wikiList==MARKUP_UL ) return;
   blob_appendf(p->pOut, "<p>", -1);
   pushStack(p, MARKUP_P);
   p->wantAutoParagraph = 0;
   p->inAutoParagraph = 1;