summaryrefslogtreecommitdiffhomepage
path: root/src/Parsers.hs
diff options
context:
space:
mode:
authorJose Antonio Ortega Ruiz <jao@gnu.org>2011-08-30 03:00:30 +0200
committerJose Antonio Ortega Ruiz <jao@gnu.org>2011-08-30 03:00:30 +0200
commit991af6b4be4a8062b8b61ce73ea93149d9886ded (patch)
tree799cba2ea75c4cec53f8700f593f99b7855888ac /src/Parsers.hs
parent4de90f467636ed7bfe6f40d470df4da61574d111 (diff)
parenta49eb5f2432631fbf691b1e4abb7100bda8078f4 (diff)
downloadxmobar-991af6b4be4a8062b8b61ce73ea93149d9886ded.tar.gz
xmobar-991af6b4be4a8062b8b61ce73ea93149d9886ded.tar.bz2
Merge branch 'master' of github.com:jaor/xmobar
Diffstat (limited to 'src/Parsers.hs')
-rw-r--r--src/Parsers.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/Parsers.hs b/src/Parsers.hs
index baaa287..f5f00a9 100644
--- a/src/Parsers.hs
+++ b/src/Parsers.hs
@@ -159,7 +159,8 @@ parseConfig = runParser parseConf fields "Config" . stripComments
return ("Static {" ++ p ++ "}")
tillFieldEnd = staticPos <|> many (noneOf ",}\n\r")
- commandsEnd = wrapSkip (string "]") >> oneOf "},"
+ commandsEnd = wrapSkip (string "]") >> (string "}" <|> notNextRun)
+ notNextRun = do { string ","; notFollowedBy $ wrapSkip $ string "Run"; return ","}
readCommands = manyTill anyChar (try commandsEnd) >>= read' commandsErr . flip (++) "]"
strField e n = field e n . between (strDel "start" n) (strDel "end" n) . many $ noneOf "\"\n\r"