68ec269 · vty · git.iko.soy

git.iko.soy/vty

remove redundant $s

commit68ec269cf541c4a75d4c7bd147ae939799d95798 authorWillem Van Onsem <vanonsem.willem@gmail.com> dateThu 18 Feb 2021, 07:40 (6 years ago) parente886dc0

3 files changed+4−5

compare with master

unifiedsplit

src/Graphics/Vty/Inline.hs+2−2 src/Graphics/Vty/Input/Classify.hs+1−1 src/Graphics/Vty/Output/TerminfoBased.hs+1−2

src/Graphics/Vty/Inline.hs+2−2

@@ -85,8 +85,8 @@ removeStyle :: Style -> InlineM ()

8585removeStyle sMask = modify $ \s ->

8686 s { inlineAttr =

8787 let style' = case attrStyle (inlineAttr s) of

88− Default -> error $ "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."

89− KeepCurrent -> error $ "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."

88+ Default -> error "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."

89+ KeepCurrent -> error "Graphics.Vty.Inline: Cannot removeStyle if applyStyle never used."

9090 SetTo st -> st .&. complement sMask

9191 in (inlineAttr s) { attrStyle = SetTo style' }

9292 }

src/Graphics/Vty/Input/Classify.hs+1−1

@@ -27,7 +27,7 @@ import Data.Word

2727compile :: ClassifyMap -> String -> KClass

2828compile table = cl' where

2929 -- take all prefixes and create a set of these

30− prefixSet = S.fromList $ concatMap (init . inits . fst) $ table

30+ prefixSet = S.fromList $ concatMap (init . inits . fst) table

3131 maxValidInputLength = maximum (map (length . fst) table)

3232 eventForInput = M.fromList table

3333 cl' [] = Prefix

src/Graphics/Vty/Output/TerminfoBased.hs+1−2

@@ -355,8 +355,7 @@ terminfoWriteSetAttr dc terminfoCaps urlsEnabled prevAttr reqAttr diffs =

355355 setColors

356356 -- implicitly resets the colors to the defaults

357357 SetState state -> writeCapExpr (fromJust $ setAttrStates

358− $ displayAttrCaps

359− $ terminfoCaps

358+ $ displayAttrCaps terminfoCaps

360359 )

361360 (sgrArgsForState state)

362361 `mappend` setItalics