[Pkg-haskell-commits] darcs: yi: start cleanup for packaging new upstream versions
Marcel Fourné
debian at marcelfourne.de
Sun May 31 10:42:22 UTC 2015
Sun May 31 10:41:33 UTC 2015 Marcel Fourn[_<U+00E9>_] <debian at marcelfourne.de>
* start cleanup for packaging new upstream versions
M ./changelog -3 +9
M ./control -62 +38
R ./patches/Yi.Syntax.Tree-quickcheck-2.7-patch.diff
M ./patches/series -2
R ./patches/vty-5.1-compat
Sun May 31 10:41:33 UTC 2015 Marcel Fourné <debian at marcelfourne.de>
* start cleanup for packaging new upstream versions
diff -rN -u old-yi/changelog new-yi/changelog
--- old-yi/changelog 2015-05-31 10:42:22.637882793 +0000
+++ new-yi/changelog 2015-05-31 10:42:22.637882793 +0000
@@ -1,8 +1,14 @@
-yi (0.7.1-6) UNRELEASED; urgency=medium
+yi (0.12.0-1) UNRELEASED; urgency=medium
+ [ Joachim Breitner ]
* Depend on haskell-devscripts 0.9, found in experimental
- -- Joachim Breitner <nomeata at debian.org> Sat, 20 Dec 2014 16:59:52 +0100
+ [ Marcel Fourné ]
+ * New upstream version 0.12.0, closes #781408
+ * Drop vty-5.1 compatibilty patch, no longer needed
+ * Drop QuickCheck2.7 compatibility patch, no longer needed
+
+ -- Marcel Fourné <debian at marcelfourne.de> Wed, 20 May 2015 19:09:32 +0200
yi (0.7.1-5) unstable; urgency=medium
diff -rN -u old-yi/control new-yi/control
--- old-yi/control 2015-05-31 10:42:22.637882793 +0000
+++ new-yi/control 2015-05-31 10:42:22.637882793 +0000
@@ -5,122 +5,98 @@
Uploaders: Masayuki Hatta (mhatta) <mhatta at debian.org>
Build-Depends: debhelper (>= 9)
, haskell-devscripts (>= 0.9)
+ , alex (>= 3.0.3)
, cdbs
, ghc
, ghc-prof
- , libghc-diff-dev (>= 0.1)
- , libghc-diff-dev (<< 0.4)
- , libghc-diff-prof
- , libghc-quickcheck2-dev (>= 2.1.0.2)
- , libghc-quickcheck2-prof
- , libghc-cautious-file-dev (>= 1.0.1)
- , libghc-cautious-file-prof
- , libghc-concrete-typerep-dev (>= 0.1.0.2)
- , libghc-concrete-typerep-dev (<< 0.1.1)
- , libghc-concrete-typerep-prof
- , libghc-data-accessor-dev (>= 0.2.1.4)
- , libghc-data-accessor-dev (<< 0.3)
- , libghc-data-accessor-prof
- , libghc-data-accessor-mtl-dev (>= 0.2)
- , libghc-data-accessor-mtl-dev (<< 0.3)
- , libghc-data-accessor-mtl-prof
- , libghc-data-accessor-template-dev (>= 0.2.1.3)
- , libghc-data-accessor-template-dev (<< 0.2.2)
- , libghc-data-accessor-template-prof
, libghc-data-default-dev
, libghc-data-default-prof
- , libghc-derive-dev (>= 2.4)
- , libghc-derive-dev (<< 2.7)
- , libghc-derive-prof
, libghc-dlist-dev (>= 0.4.1)
, libghc-dlist-prof
+ , libghc-dynamic-state-dev (>= 0.1.0.5)
+ , libghc-dynamic-state-prof
, libghc-dyre-dev (>= 0.8.11)
, libghc-dyre-prof
- , libghc-fingertree-dev (<< 0.2)
- , libghc-fingertree-prof
- , libghc-ghc-paths-dev (>= 0.1)
- , libghc-ghc-paths-dev (<< 0.2)
- , libghc-ghc-paths-prof
+ , libghc-gtk-dev
+ , libghc-gtk-prof
, libghc-hashable-dev (>= 1.1.2.5)
, libghc-hashable-prof
, libghc-hint-dev (>> 0.3.1)
, libghc-hint-prof
+ , libghc-lens-dev (>= 4.4.0.1)
+ , libghc-lens-prof
, libghc-mtl-dev (>= 0.1.0.1)
, libghc-mtl-prof
+ , libghc-oo-prototypes-dev
+ , libghc-oo-prototypes-prof
, libghc-parsec3-dev
, libghc-parsec3-prof
- , libghc-pointedlist-dev (>= 0.4)
- , libghc-pointedlist-dev (<< 0.6)
+ , libghc-pointedlist-dev (>= 0.5)
, libghc-pointedlist-prof
- , libghc-puremd5-dev (>= 0.2.3)
- , libghc-puremd5-prof
- , libghc-random-dev
- , libghc-random-prof
+ , libghc-quickcheck2-dev (>= 2.7)
+ , libghc-quickcheck2-dev (<< 2.8)
+ , libghc-quickcheck2-prof
, libghc-regex-base-dev (>= 0.93)
, libghc-regex-base-dev (<< 0.94)
, libghc-regex-base-prof
, libghc-regex-tdfa-dev (>= 1.1)
, libghc-regex-tdfa-dev (<< 1.3)
, libghc-regex-tdfa-prof
- , libghc-rosezipper-dev (>= 0.1)
- , libghc-rosezipper-dev (<< 0.3)
- , libghc-rosezipper-prof
+ , libghc-safe-dev (>= 0.3.4)
+ , libghc-safe-dev (<< 0.4)
+ , libghc-safe-prof
+ , libghc-semigroups-dev
+ , libghc-semigroups-prof
, libghc-split-dev (>= 0.1)
, libghc-split-dev (<< 0.3)
, libghc-split-prof
- , libghc-uniplate-dev
- , libghc-uniplate-prof
+ , libghc-text-dev (>= 1.1.1.3)
+ , libghc-text-prof
, libghc-unix-compat-dev (>= 0.1)
, libghc-unix-compat-dev (<< 0.5)
, libghc-unix-compat-prof
, libghc-unordered-containers-dev (>= 0.1.3)
, libghc-unordered-containers-dev (<< 0.3)
, libghc-unordered-containers-prof
- , libghc-utf8-string-dev (>= 0.3.1)
- , libghc-utf8-string-prof
, libghc-vty-dev (>= 5.2.3-2)
, libghc-vty-dev (<< 6)
, libghc-vty-prof
+ , libghc-word-trie-dev (>= 0.2.0.4)
+ , libghc-word-trie-prof
, libghc-xdg-basedir-dev (>= 0.2.1)
, libghc-xdg-basedir-dev (<< 0.3)
, libghc-xdg-basedir-prof
- , alex (>= 3.0.3)
- , libghc-gtk-dev
- , libghc-gtk-prof
- , libghc-vte-dev
- , libghc-vte-prof
+ , libghc-yi-language-dev (>= 0.1.1.0)
+ , libghc-yi-language-prof
+ , libghc-yi-rope-dev (>= 0.7.0.0)
+ , libghc-yi-rope-dev (<= 0.8)
+ , libghc-yi-rope-prof
Build-Depends-Indep: ghc-doc
- , libghc-diff-doc
- , libghc-quickcheck2-doc
- , libghc-cautious-file-doc
- , libghc-concrete-typerep-doc
- , libghc-data-accessor-doc
- , libghc-data-accessor-mtl-doc
- , libghc-data-accessor-template-doc
, libghc-data-default-doc
- , libghc-derive-doc
, libghc-dlist-doc
+ , libghc-dynamic-state-doc
, libghc-dyre-doc
- , libghc-fingertree-doc
- , libghc-ghc-paths-doc
+ , libghc-gtk-doc
, libghc-hashable-doc
, libghc-hint-doc
+ , libghc-lens-doc
, libghc-mtl-doc
+ , libghc-oo-prototypes-doc
, libghc-parsec3-doc
, libghc-pointedlist-doc
- , libghc-puremd5-doc
- , libghc-random-doc
+ , libghc-quickcheck2-doc
, libghc-regex-base-doc
, libghc-regex-tdfa-doc
- , libghc-rosezipper-doc
+ , libghc-safe-doc
+ , libghc-semigroups-doc
, libghc-split-doc
- , libghc-uniplate-doc
, libghc-unix-compat-doc
, libghc-unordered-containers-doc
- , libghc-utf8-string-doc
, libghc-vty-doc
- , libghc-gtk-doc
- , libghc-vte-doc
+ , libghc-word-trie-doc
+ , libghc-xdg-basedir-doc
+ , libghc-yi-language-doc
+ , libghc-yi-rope-doc
Standards-Version: 3.9.4
Homepage: http://haskell.org/haskellwiki/Yi
Vcs-Darcs: http://darcs.debian.org/pkg-haskell/yi
diff -rN -u old-yi/patches/series new-yi/patches/series
--- old-yi/patches/series 2015-05-31 10:42:22.629882618 +0000
+++ new-yi/patches/series 2015-05-31 10:42:22.641882880 +0000
@@ -1,4 +1,2 @@
xpm-icons.diff
man-page.diff
-Yi.Syntax.Tree-quickcheck-2.7-patch.diff
-vty-5.1-compat
diff -rN -u old-yi/patches/vty-5.1-compat new-yi/patches/vty-5.1-compat
--- old-yi/patches/vty-5.1-compat 2015-05-31 10:42:22.629882618 +0000
+++ new-yi/patches/vty-5.1-compat 1970-01-01 00:00:00.000000000 +0000
@@ -1,346 +0,0 @@
-Description: Rework vty interface code like commit a42841dbeb4f716a50b82aa4c71c419f033806d5
- This is a rework of a patch from upstream git to vty 5.1 API, adapted to yi 0.7.1 in Debian by Marcel Fourné.
- .
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: upstream, https://github.com/yi-editor/yi/commit/a42841dbeb4f716a50b82aa4c71c419f033806d5#diff-68f4dd75b91abeba23f0417a614830e5
-
---- yi-0.7.1.orig/src/library/Yi/Config.hs
-+++ yi-0.7.1/src/library/Yi/Config.hs
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {-# LANGUAGE TemplateHaskell #-}
-
- module Yi.Config where
-@@ -16,9 +17,14 @@ import Yi.Style
- import Yi.Style.Library
- import {-# source #-} Yi.UI.Common
- import qualified Yi.Interact as I
-+#ifdef FRONTEND_VTY
-+import qualified Graphics.Vty as Vty
-+#endif
-
- data UIConfig = UIConfig {
-- configVtyEscDelay :: Int,
-+#ifdef FRONTEND_VTY
-+ configVty :: Vty.Config,
-+#endif
- configFontName :: Maybe String, -- ^ Font name, for the UI that support it.
- configFontSize :: Maybe Int, -- ^ Font size, for the UI that support it.
- configScrollStyle ::Maybe ScrollStyle,
---- yi-0.7.1.orig/src/library/Yi/Config/Default.hs
-+++ yi-0.7.1/src/library/Yi/Config/Default.hs
-@@ -6,6 +6,7 @@ module Yi.Config.Default (defaultConfig,
- toVimStyleConfig, toVim2StyleConfig, toEmacsStyleConfig, toCuaStyleConfig) where
-
- import Control.Monad (forever)
-+import Data.Default
- import Data.Either (rights)
- import Paths_yi
- import Prelude ()
-@@ -47,6 +47,7 @@ import qualified Yi.UI.Vte
- #endif
- #ifdef FRONTEND_VTY
- import qualified Yi.UI.Vty
-+import qualified Graphics.Vty.Config as Vty
- #endif
- #ifdef FRONTEND_PANGO
- import qualified Yi.UI.Pango
-@@ -145,7 +146,9 @@ defaultConfig =
- , configAutoHideTabBar = True
- , configWindowFill = ' '
- , configTheme = defaultTheme
-- , configVtyEscDelay = 0
-+#ifdef FRONTEND_VTY
-+ , configVty = def
-+#endif
- }
- , defaultKm = modelessKeymapSet nilKeymap
- , startActions = []
-@@ -193,7 +193,16 @@ defaultCuaConfig = toCuaStyleConfig defa
- toEmacsStyleConfig, toVimStyleConfig, toVim2StyleConfig, toCuaStyleConfig :: Config -> Config
- toEmacsStyleConfig cfg
- = cfg {
-- configUI = (configUI cfg) { configVtyEscDelay = 1000 , configScrollStyle = Just SnapToCenter},
-+ configUI = (configUI cfg)
-+ { configScrollStyle = Just SnapToCenter
-+#ifdef FRONTEND_VTY
-+ -- corey: does this actually matter? escToMeta appears to perform all the
-+ -- meta joining required. I'm not an emacs user and cannot evaluate feel. For
-+ -- me these settings join esc;key to meta-key OK. The 100 millisecond lag in
-+ -- ESC is terrible for me. Maybe that's just how it is under emacs...
-+ , configVty = def { Vty.vtime = Just 100, Vty.vmin = Just 2 }
-+#endif
-+ },
- defaultKm = Emacs.keymap,
- startActions = makeAction openScratchBuffer : startActions cfg,
- configInputPreprocess = escToMeta,
---- yi-0.7.1.orig/src/library/Yi/Config/Simple.hs
-+++ yi-0.7.1/src/library/Yi/Config/Simple.hs
-@@ -108,7 +108,7 @@ import Yi.Config(Config, UIConfig,
- startFrontEndA, configUIA, startActionsA, initialActionsA, defaultKmA,
- configInputPreprocessA, modeTableA, debugModeA,
- configRegionStyleA, configKillringAccumulateA, bufferUpdateHandlerA,
-- configVtyEscDelayA, configFontNameA, configFontSizeA, configScrollWheelAmountA,
-+ configVtyA, configFontNameA, configFontSizeA, configScrollWheelAmountA,
- configScrollStyleA, configCursorStyleA, CursorStyle(..),
- configLeftSideScrollBarA, configAutoHideScrollBarA, configAutoHideTabBarA,
- configLineWrapA, configWindowFillA, configThemeA, layoutManagersA, configVarsA,
---- yi-0.7.1.orig/src/library/Yi/UI/Vty.hs
-+++ yi-0.7.1/src/library/Yi/UI/Vty.hs
-@@ -34,7 +34,7 @@ import qualified Yi.UI.Common as Common
- import Yi.Config
- import Yi.Window
- import Yi.Style as Style
--import Graphics.Vty as Vty hiding (refresh, Default)
-+import Graphics.Vty as Vty hiding (Config(..), refresh, Default, text)
- import qualified Graphics.Vty as Vty
- import Yi.Keymap (makeAction, YiM)
-
-@@ -73,11 +73,11 @@ start :: UIBoot
- start cfg ch outCh editor = do
- liftIO $ do
- oattr <- getTerminalAttributes stdInput
-- v <- mkVtyEscDelay $ configVtyEscDelay $ configUI $ cfg
-+ v <- mkVty $ configVty $ configUI $ cfg
- nattr <- getTerminalAttributes stdInput
- setTerminalAttributes stdInput (withoutMode nattr ExtendedFunctions) Immediately
- -- remove the above call to setTerminalAttributes when vty does it.
-- Vty.DisplayRegion x0 y0 <- Vty.display_bounds $ Vty.terminal v
-+ (x0,y0) <- Vty.displayBounds $ Vty.outputIface v
- sz <- newIORef (fromEnum y0, fromEnum x0)
- -- fork input-reading thread. important to block *thread* on getKey
- -- otherwise all threads will block waiting for input
-@@ -97,7 +97,7 @@ start cfg ch outCh editor = do
- -- | Read a key. UIs need to define a method for getting events.
- getKey :: IO Yi.Event.Event
- getKey = do
-- event <- Vty.next_event v
-+ event <- Vty.nextEvent v
- case event of
- (EvResize x y) -> do
- logPutStrLn $ "UI: EvResize: " ++ show (x,y)
-@@ -146,28 +146,28 @@ fromVtyEvent _ = error "fromVtyEvent: un
-
-
- fromVtyKey :: Vty.Key -> Yi.Event.Key
--fromVtyKey (Vty.KEsc ) = Yi.Event.KEsc
--fromVtyKey (Vty.KFun x ) = Yi.Event.KFun x
--fromVtyKey (Vty.KPrtScr ) = Yi.Event.KPrtScr
--fromVtyKey (Vty.KPause ) = Yi.Event.KPause
--fromVtyKey (Vty.KASCII '\t') = Yi.Event.KTab
--fromVtyKey (Vty.KASCII c ) = Yi.Event.KASCII c
--fromVtyKey (Vty.KBS ) = Yi.Event.KBS
--fromVtyKey (Vty.KIns ) = Yi.Event.KIns
--fromVtyKey (Vty.KHome ) = Yi.Event.KHome
--fromVtyKey (Vty.KPageUp ) = Yi.Event.KPageUp
--fromVtyKey (Vty.KDel ) = Yi.Event.KDel
--fromVtyKey (Vty.KEnd ) = Yi.Event.KEnd
--fromVtyKey (Vty.KPageDown) = Yi.Event.KPageDown
--fromVtyKey (Vty.KNP5 ) = Yi.Event.KNP5
--fromVtyKey (Vty.KUp ) = Yi.Event.KUp
--fromVtyKey (Vty.KMenu ) = Yi.Event.KMenu
--fromVtyKey (Vty.KLeft ) = Yi.Event.KLeft
--fromVtyKey (Vty.KDown ) = Yi.Event.KDown
--fromVtyKey (Vty.KRight ) = Yi.Event.KRight
--fromVtyKey (Vty.KEnter ) = Yi.Event.KEnter
--fromVtyKey (Vty.KBackTab ) = error "This should be handled in fromVtyEvent"
--fromVtyKey (Vty.KBegin ) = error "Yi.UI.Vty.fromVtyKey: can't handle KBegin"
-+fromVtyKey (Vty.KEsc ) = Yi.Event.KEsc
-+fromVtyKey (Vty.KFun x ) = Yi.Event.KFun x
-+fromVtyKey (Vty.KPrtScr ) = Yi.Event.KPrtScr
-+fromVtyKey (Vty.KPause ) = Yi.Event.KPause
-+fromVtyKey (Vty.KChar '\t') = Yi.Event.KTab
-+fromVtyKey (Vty.KChar c ) = Yi.Event.KASCII c
-+fromVtyKey (Vty.KBS ) = Yi.Event.KBS
-+fromVtyKey (Vty.KIns ) = Yi.Event.KIns
-+fromVtyKey (Vty.KHome ) = Yi.Event.KHome
-+fromVtyKey (Vty.KPageUp ) = Yi.Event.KPageUp
-+fromVtyKey (Vty.KDel ) = Yi.Event.KDel
-+fromVtyKey (Vty.KEnd ) = Yi.Event.KEnd
-+fromVtyKey (Vty.KPageDown ) = Yi.Event.KPageDown
-+fromVtyKey (Vty.KCenter ) = Yi.Event.KNP5
-+fromVtyKey (Vty.KUp ) = Yi.Event.KUp
-+fromVtyKey (Vty.KMenu ) = Yi.Event.KMenu
-+fromVtyKey (Vty.KLeft ) = Yi.Event.KLeft
-+fromVtyKey (Vty.KDown ) = Yi.Event.KDown
-+fromVtyKey (Vty.KRight ) = Yi.Event.KRight
-+fromVtyKey (Vty.KEnter ) = Yi.Event.KEnter
-+fromVtyKey (Vty.KBackTab ) = error "This should be handled in fromVtyEvent"
-+fromVtyKey (Vty.KBegin ) = error "Yi.UI.Vty.fromVtyKey: can't handle KBegin"
-
- fromVtyMod :: Vty.Modifier -> Yi.Event.Modifier
- fromVtyMod Vty.MShift = Yi.Event.MShift
-@@ -229,13 +229,13 @@ refresh ui e = do
- logPutStrLn "refreshing screen."
- logPutStrLn $ "startXs: " ++ show startXs
- Vty.update (vty $ ui)
-- ( pic_for_image ( vert_cat tabBarImages
-- <->
-- vert_cat (toList wImages)
-- <->
-- vert_cat (fmap formatCmdLine niceCmd)
-- )
-- ) { pic_cursor = case cursor (PL._focus renders) of
-+ ( picForImage ( vertCat tabBarImages
-+ <->
-+ vertCat (toList wImages)
-+ <->
-+ vertCat (fmap formatCmdLine niceCmd)
-+ )
-+ ) { picCursor = case cursor (PL._focus renders) of
- Just (y,x) -> Cursor (toEnum x) (toEnum $ y + PL._focus startXs)
- -- Add the position of the window to the position of the cursor
- Nothing -> NoCursor
-@@ -254,12 +254,12 @@ renderTabBar e ui xss =
- where tabImages = foldr1 (<|>) $ fmap tabToVtyImage $ tabBarDescr e
- extraImage = withAttributes (tabBarAttributes uiStyle) (replicate (xss - fromEnum totalTabWidth) ' ')
-
-- totalTabWidth = Vty.image_width tabImages
-+ totalTabWidth = Vty.imageWidth tabImages
- uiStyle = configStyle $ configUI $ config ui
- tabTitle text = " " ++ text ++ " "
- tabAttr b = baseAttr b $ tabBarAttributes uiStyle
-- baseAttr True sty = attributesToAttr (appEndo (tabInFocusStyle uiStyle) sty) Vty.def_attr
-- baseAttr False sty = attributesToAttr (appEndo (tabNotFocusedStyle uiStyle) sty) Vty.def_attr `Vty.with_style` Vty.underline
-+ baseAttr True sty = attributesToAttr (appEndo (tabInFocusStyle uiStyle) sty) Vty.defAttr
-+ baseAttr False sty = attributesToAttr (appEndo (tabNotFocusedStyle uiStyle) sty) Vty.defAttr `Vty.withStyle` Vty.underline
- tabToVtyImage _tab@(TabDescr text inFocus) = Vty.string (tabAttr inFocus) (tabTitle text)
-
- -- | Determine whether it is necessary to render the tab bar
-@@ -303,7 +303,7 @@ drawWindow cfg e focused win w h = (Rend
- off = if notMini then 1 else 0
- h' = h - off
- ground = baseAttributes sty
-- wsty = attributesToAttr ground Vty.def_attr
-+ wsty = attributesToAttr ground Vty.defAttr
- eofsty = appEndo (eofStyle sty) ground
- (point, _) = runBuffer win b pointB
- (eofPoint, _) = runBuffer win b sizeB
-@@ -320,9 +320,9 @@ drawWindow cfg e focused win w h = (Rend
- -- TODO: I suspect that this costs quite a lot of CPU in the "dry run" which determines the window size;
- -- In that case, since attributes are also useless there, it might help to replace the call by a dummy value.
- -- This is also approximately valid of the call to "indexedAnnotatedStreamB".
-- colors = map (second (($ Vty.def_attr) . attributesToAttr)) attributes
-+ colors = map (second (($ Vty.defAttr) . attributesToAttr)) attributes
- bufData = -- trace (unlines (map show text) ++ unlines (map show $ concat strokes)) $
-- paintChars Vty.def_attr colors text
-+ paintChars Vty.defAttr colors text
- tabWidth = tabSize . fst $ runBuffer win b indentSettingsB
- prompt = if isMini win then miniIdentString b else ""
-
-@@ -338,7 +338,7 @@ drawWindow cfg e focused win w h = (Rend
- modeStyle = (if focused then appEndo (modelineFocusStyle sty) else id) (modelineAttributes sty)
- filler = take w (configWindowFill cfg : repeat ' ')
-
-- pict = vert_cat (take h' (rendered ++ repeat (withAttributes eofsty filler)) ++ modeLines)
-+ pict = vertCat (take h' (rendered ++ repeat (withAttributes eofsty filler)) ++ modeLines)
-
- -- | Renders text in a rectangle.
- -- This also returns
-@@ -357,7 +357,7 @@ drawText :: Int -- ^ The height of th
- -> ([Image], Point, Maybe (Int,Int), Int)
- drawText h w topPoint point tabWidth bufData
- | h == 0 || w == 0 = ([], topPoint, Nothing, 0)
-- | otherwise = (rendered_lines, bottomPoint, pntpos, h - (length wrapped - h))
-+ | otherwise = (renderedLines, bottomPoint, pntpos, h - (length wrapped - h))
- where
-
- -- the number of lines that taking wrapping into account,
-@@ -372,14 +372,14 @@ drawText h w topPoint point tabWidth buf
- pntpos = listToMaybe [(y,x) | (y,l) <- zip [0..] lns0, (x,(_char,(_attr,p))) <- zip [0..] l, p == point]
-
- -- fill lines with blanks, so the selection looks ok.
-- rendered_lines = map fillColorLine lns0
-+ renderedLines = map fillColorLine lns0
- colorChar (c, (a, _aPoint)) = Vty.char a c
-
- fillColorLine :: [(Char, (Vty.Attr, Point))] -> Image
-- fillColorLine [] = char_fill Vty.def_attr ' ' w 1
-- fillColorLine l = horiz_cat (map colorChar l)
-+ fillColorLine [] = charFill Vty.defAttr ' ' w 1
[...incomplete...]
More information about the Pkg-haskell-commits
mailing list