pass MULTILINE as a flag, not a count

[etc/mutt.git] / .mutt / markdown2html

diff --git a/.mutt/markdown2html b/.mutt/markdown2html
index 44ec07c99cab6ae0fcd109dcac6375a853e93bcc..e3c2b302a6b593daa6e2f6bb4b4613e502e3aca3 100755 (executable)
--- a/.mutt/markdown2html
+++ b/.mutt/markdown2html
@@ -98,7 +98,7 @@ def _preprocess_markdown(mdwn):
     # convert hard line breaks within paragraphs to 2 trailing spaces, which
     # is the markdown way of representing hard line breaks. Note how the
     # regexp will not match between paragraphs.
     # convert hard line breaks within paragraphs to 2 trailing spaces, which
     # is the markdown way of representing hard line breaks. Note how the
     # regexp will not match between paragraphs.

-    ret = re.sub(r'(\S)\n(\s*\S)', r'\g<1>  \n\g<2>', mdwn, re.MULTILINE)
+    ret = re.sub(r'(\S)\n(\s*\S)', r'\g<1>  \n\g<2>', mdwn, flags=re.MULTILINE)

 
     return ret
 
 
     return ret
 


@@ -153,13 +153,13 @@ def _identify_quotes_for_later(mdwn):
         elif prev and re.match(r'^.+:\s*$', prev) and cur.startswith('>'):
             ret.append(re.sub(r'^(\s*>\s*)+(.+)',
                               r'\g<1>{.quoteinitial}\g<2>',
         elif prev and re.match(r'^.+:\s*$', prev) and cur.startswith('>'):
             ret.append(re.sub(r'^(\s*>\s*)+(.+)',
                               r'\g<1>{.quoteinitial}\g<2>',

-                              cur, re.MULTILINE))
+                              cur, flags=re.MULTILINE))

 
         # All other occurrences of blockquotes get the "subsequent" marker:
 
         # All other occurrences of blockquotes get the "subsequent" marker:

-        elif cur.startswith('>') and not prev.startswith('>'):
+        elif cur.startswith('>') and prev and not prev.startswith('>'):

             ret.append(re.sub(r'^((?:\s*>\s*)+)(.+)',
                               r'\g<1>{.quotesubsequent}\g<2>',
             ret.append(re.sub(r'^((?:\s*>\s*)+)(.+)',
                               r'\g<1>{.quotesubsequent}\g<2>',

-                              cur, re.MULTILINE))
+                              cur, flags=re.MULTILINE))

 
         else: # pass through everything else.
             ret.append(cur)
 
         else: # pass through everything else.
             ret.append(cur)


@@ -174,7 +174,7 @@ def _reformat_quotes(html):
     '''
     ret = html.replace('<p>{.quotelead}', '<p class="quotelead">')
     ret = re.sub(r'<blockquote>\n((?:<blockquote>\n)*)<p>(?:\{\.quote(\w+)\})',
     '''
     ret = html.replace('<p>{.quotelead}', '<p class="quotelead">')
     ret = re.sub(r'<blockquote>\n((?:<blockquote>\n)*)<p>(?:\{\.quote(\w+)\})',

-                 r'<blockquote class="quote \g<2>">\n\g<1><p>', ret, re.MULTILINE)
+                 r'<blockquote class="quote \g<2>">\n\g<1><p>', ret, flags=re.MULTILINE)

     return ret
 
 
     return ret