cgrep 6.4.10 → 6.4.11

raw patch · 4 files changed

+7/−8 lines, 4 files

Files

README.md +1/−1
cgrep.cabal +1/−1
src/Config.hs +2/−2
src/Main.hs +3/−4

README.md view

@@ -4,7 +4,7 @@ Usage ----- -Cgrep 6.4.10 Usage: cgrep [OPTION] [PATTERN] files...+Cgrep 6.4.11 Usage: cgrep [OPTION] [PATTERN] files...  cgrep [OPTIONS] [ITEM]

cgrep.cabal view

@@ -1,6 +1,6 @@ Name:                cgrep Description:         Cgrep: a context-aware grep for source codes-Version:             6.4.10+Version:             6.4.11 Synopsis:            Command line tool Homepage:            http://awgn.github.io/cgrep/ License:             GPL-2

src/Config.hs view

@@ -31,14 +31,14 @@ cgreprc = "cgreprc"  version :: String-version = "6.4.10"+version = "6.4.11"   data Config = Config               {                     configLanguages  :: [Lang],                     configPruneDirs  :: [String],-                    configColor      :: Bool+                    configAutoColor  :: Bool                } deriving (Show, Read)

src/Main.hs view

@@ -76,8 +76,7 @@                            else case getLang opts filename >>= (\f -> f `elemIndex` langs <|> toMaybe 0 (null langs) ) of                                    Nothing -> return ()                                    _       -> atomically $ writeTChan inchan (Just path)-                )-                (\e -> let msg = show (e :: SomeException) in hPutStrLn stderr ("cgrep: " ++ msg))+                ) (\e -> let msg = show (e :: SomeException) in hPutStrLn stderr ("cgrep: " ++ msg))         else atomically $ writeTChan inchan (Just topdir)  @@ -103,8 +102,8 @@      -- read command-line options -    opts  <- if isTermOut then (\o@Options{color = c} -> o { color = c || configColor conf}) <$> cmdArgsRun options-                          else (\x -> x {color = False}) <$>  cmdArgsRun options+    opts  <- (if isTermOut then (\o@Options{color = c} -> o { color = c || configAutoColor conf})+                           else id) <$> cmdArgsRun options      -- check for multiple backends...