+ Added some needed "try"s before multicharacter parsers,

  especially in "option" contexts.
+ Removed the "try" from the "end" parser in "enclosed"
  (Text.Pandoc.Shared).  Now "enclosed" behaves like
  "option", "manyTill", etc.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@527 788f1e2b-df1e-0410-8736-df70ead52e1b

1 files changed, 2 insertions, 2 deletions

diff --git a/src/Text/ParserCombinators/Pandoc.hs b/src/Text/ParserCombinators/Pandoc.hs
index a825ef8ff..93494241a 100644
--- a/src/Text/ParserCombinators/Pandoc.hs
+++ b/src/Text/ParserCombinators/Pandoc.hs
@@ -93,14 +93,14 @@ escaped parser = try (do
                         return (Str [result]))
 
 -- | Parses material enclosed between start and end parsers.
-enclosed :: GenParser Char st t       -- ^ start parser
+enclosed :: GenParser Char st t   -- ^ start parser
 	    -> GenParser Char st end  -- ^ end parser
 	    -> GenParser Char st a    -- ^ content parser (to be used repeatedly)
 	    -> GenParser Char st [a]
 enclosed start end parser = try (do
                                    start
                                    notFollowedBy space
-                                   result <- many1Till parser (try end)
+                                   result <- many1Till parser end
                                    return result)
 
 -- | Like @manyTill@, but reads at least one item.