Differences From:

File src/wikiformat.c part of check-in [e0131b1a66] - Fix a (harmless) compiler warning in wikiformat.c. by drh on 2009-09-19 15:20:59. [view]

To:

File src/wikiformat.c part of check-in [d6bfe8d9a8] - Change default ticket viewer format to display ticket title as wiki. Show event summaries as wiki on the timeline. Allow <nowiki> markup in "NOBLOCK" wiki renderings. Ticket 218153bb7c3. by drh on 2009-09-23 13:08:33. [view]

@@ -1213,20 +1213,20 @@
         if( (markup.iType&MUTYPE_FONT)==0 && (p->state & FONT_MARKUP_ONLY)!=0 ){
           /* Do nothing */
         }else
 
-        /* Ignore block markup for in-line rendering.
-        */
-        if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
-          /* Do nothing */
-        }else
-
         if( markup.iCode==MARKUP_NOWIKI ){
           if( markup.endTag ){
             p->state |= ALLOW_WIKI;
           }else{
             p->state &= ~ALLOW_WIKI;
           }
+        }else
+
+        /* Ignore block markup for in-line rendering.
+        */
+        if( inlineOnly && (markup.iType&MUTYPE_INLINE)==0 ){
+          /* Do nothing */
         }else
 
         /* Generate end-tags */
         if( markup.endTag ){