summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomMurphy <>2020-11-20 04:44:00 (GMT)
committerhdiff <hdiff@hdiff.luite.com>2020-11-20 04:44:00 (GMT)
commitd87036ae02f60b0a8be1dd247ad623d59d77d1d3 (patch)
tree7e97dfaccb5d84568d06e3552c300e036f85478e
parentf7db5372a6733192b30792817b41b47b34c0d6b6 (diff)
version 0.19.1HEAD0.19.1master
-rw-r--r--src/Yi/Main.hs10
-rw-r--r--yi-dynamic-configuration.cabal2
2 files changed, 6 insertions, 6 deletions
diff --git a/src/Yi/Main.hs b/src/Yi/Main.hs
index 78ebdcc..e38fe0e 100644
--- a/src/Yi/Main.hs
+++ b/src/Yi/Main.hs
@@ -124,8 +124,8 @@ do_args ignoreUnknown cfg args = let options = customOptions cfg ++ builtinOptio
(os, [], [], []) -> handle options os
(os, _, u:us, []) -> if ignoreUnknown
then handle options os
- else fail $ "unknown arguments: " ++ intercalate ", " (u:us)
- (_os, _ex, _ey, errs) -> fail (concat errs)
+ else Prelude.error $ "unknown arguments: " ++ intercalate ", " (u:us)
+ (_os, _ex, _ey, errs) -> Prelude.error (concat errs)
where
shouldOpenInTabs = ("--" ++ openInTabsLong) `elem` args
|| ('-':[openInTabsShort]) `elem` args
@@ -135,13 +135,13 @@ do_args ignoreUnknown cfg args = let options = customOptions cfg ++ builtinOptio
getConfig :: [OptDescr Opts] -> Bool -> (Config, ConsoleConfig) -> Opts -> Either OptionError (Config, ConsoleConfig)
getConfig options shouldOpenInTabs (cfg, cfgcon) opt =
case opt of
- Frontend _ -> fail "Panic: frontend not found"
+ Frontend _ -> Prelude.error "Panic: frontend not found"
Help -> Left $ OptionError (usage options) ExitSuccess
Version -> Left $ OptionError versinfo ExitSuccess
Debug -> return (cfg { debugMode = True }, cfgcon)
LineNo l -> case startActions cfg of
x : xs -> return (cfg { startActions = x:makeAction (gotoLn (read l)):xs }, cfgcon)
- [] -> fail "The `-l' option must come after a file argument"
+ [] -> Prelude.error "The `-l' option must come after a file argument"
File filename -> if shouldOpenInTabs && not (null (startActions cfg)) then
prependActions [YiA $ openNewFile filename, EditorA newTabE]
@@ -150,7 +150,7 @@ getConfig options shouldOpenInTabs (cfg, cfgcon) opt =
EditorNm emul -> case lookup (fmap toLower emul) editors of
Just modifyCfg -> return (modifyCfg cfg, cfgcon)
- Nothing -> fail $ "Unknown emulation: " ++ show emul
+ Nothing -> Prelude.error $ "Unknown emulation: " ++ show emul
GhcOption ghcOpt -> return (cfg, cfgcon { ghcOptions = ghcOptions cfgcon ++ [ghcOpt] })
ConfigFile f -> return (cfg, cfgcon { userConfigDir = return f })
CustomNoArg o -> do
diff --git a/yi-dynamic-configuration.cabal b/yi-dynamic-configuration.cabal
index 65d4557..32efae3 100644
--- a/yi-dynamic-configuration.cabal
+++ b/yi-dynamic-configuration.cabal
@@ -1,5 +1,5 @@
name: yi-dynamic-configuration
-version: 0.19.0
+version: 0.19.1
synopsis: Dynamic configuration support for Yi
category: Yi
homepage: https://github.com/yi-editor/yi#readme