changeset 3222:2c314d55e45d

revert changeset 2023:dd5240822911 - the problem it fixed at that time was meanwhile fixed in another way. but now this changeset was causing other problems.
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 09 Mar 2008 15:56:42 +0100
parents e9ab91483e02
children a4e5f28467b6
files MoinMoin/parser/text_moin_wiki.py
diffstat 1 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/text_moin_wiki.py	Sun Mar 09 15:50:55 2008 +0100
+++ b/MoinMoin/parser/text_moin_wiki.py	Sun Mar 09 15:56:42 2008 +0100
@@ -399,7 +399,6 @@
         # 'found_parser' == we found a valid parser (was: 2)
         self.in_pre = None
 
-        self.no_862 = False
         self.in_table = 0
         self.inhibit_p = 0 # if set, do not auto-create a <p>aragraph
 
@@ -1320,8 +1319,7 @@
                         self._parser_content(line[lastpos:start])
                     else:
                         ###result.append(u'<span class="info">[add text before match: <tt>"%s"</tt>]</span>' % line[lastpos:match.start()])
-                        # self.no_862 is added to solve the issue of macros called inline
-                        if not (inhibit_p or self.inhibit_p or self.in_pre or self.formatter.in_p or self.no_862):
+                        if not (inhibit_p or self.inhibit_p or self.in_pre or self.formatter.in_p):
                             result.append(self.formatter.paragraph(1, css_class="line862"))
                         # add the simple text in between lastpos and beginning of current match
                         result.append(self.formatter.text(line[lastpos:start]))
@@ -1416,9 +1414,6 @@
         for line in self.lines:
             self.lineno += 1
 
-            if '>><<' in line.replace(' ', ''):
-                self.no_862 = True
-
             self.line_anchor_printed = 0
             if not self.in_table:
                 self.request.write(self._line_anchordef())