From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 13 Dec 2017 15:27:16 +0000 (+0100)
Subject: Merge branch 'master' of github.com:clean-cloogle/clean-irc
X-Git-Url: https://git.martlubbers.net/?p=cloogle-irc.git;a=commitdiff_plain;h=6074fc23351ac06daad779b3ac6c09a36590de24;hp=-c

Merge branch 'master' of github.com:clean-cloogle/clean-irc
---

6074fc23351ac06daad779b3ac6c09a36590de24
diff --combined cloogleirc.icl
index 85985d8,4eccb0e..05aaa7d
--- a/cloogleirc.icl
+++ b/cloogleirc.icl
@@@ -20,7 -20,7 +20,7 @@@ import System.Tim
  import Control.Applicative
  import qualified Control.Monad as CM
  import qualified Data.Map as DM
- from Control.Monad import class Monad, instance Monad Maybe, >>=
+ from Control.Monad import class Monad(bind), instance Monad Maybe, >>=
  from Text.Encodings.UrlEncoding import urlEncode
  import System.CommandLine
  import Internet.HTTP
@@@ -115,7 -115,7 +115,7 @@@ Start 
  //| isError bs = (Just $ "\n" +++ fromError bs +++ "\n", snd $ fclose io w)
  # (Ok bs) = bs
  # (merr, io, w) = bot (bs.bs_server, bs.bs_port) (startup bs) shutdown io (process bs.bs_strftime) w
- = (Nothing, w)//= (merr, snd $ fclose io w)
+ = (merr, snd $ fclose io w)
  	where
  		parseCLI :: [String] -> MaybeErrorString BotSettings
  		parseCLI [] = Ok
@@@ -177,7 -177,7 +177,7 @@@
  				(Nothing, w) = (Nothing, io, w)
  				(Just cs, w)
  				# msgs = map toPrefix cs
 -				#! (io, w) = foldr (log strf " (s): ") (io, w) msgs
 +//				#! (io, w) = foldr (log strf " (s): ") (io, w) msgs
  				= (Just msgs, io, w)
  
  		log :: String String IRCMessage (!*File, !*World) -> (!*File, !*World)