summaryrefslogtreecommitdiff
path: root/src/GF
diff options
context:
space:
mode:
Diffstat (limited to 'src/GF')
-rw-r--r--src/GF/Shell/HelpFile.hs8
-rw-r--r--src/GF/System/NoSignal.hs6
2 files changed, 11 insertions, 3 deletions
diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs
index db8b81a29..2b5d4ac26 100644
--- a/src/GF/Shell/HelpFile.hs
+++ b/src/GF/Shell/HelpFile.hs
@@ -561,7 +561,6 @@ txtHelpFile =
"\n Each of the flags can have the suffix _subs, which performs" ++
"\n common subexpression elimination after the main optimization." ++
"\n Thus, -optimize=all_subs is the most aggressive one." ++
- "\n" ++
"\n -optimize=share share common branches in tables" ++
"\n -optimize=parametrize first try parametrize then do share with the rest" ++
"\n -optimize=values represent tables as courses-of-values" ++
@@ -635,5 +634,10 @@ txtHelpFile =
"\n -unlexer=concat remove all spaces" ++
"\n -unlexer=bind like identity, but bind at \"&+\"" ++
"\n" ++
- "\n-- *: Commands and options marked with * are not yet implemented." ++
+ "\n-coding, Some grammars are in UTF-8, some in isolatin-1." ++
+ "\n If the letters ä (a-umlaut) and ö (u-umlaut) look strange, either" ++
+ "\n change your terminal to isolatin-1, or rewrite the grammar with" ++
+ "\n 'pg -utf8'." ++
+ "\n" ++
+ "\n-- *: Commands and options marked with * are not currently implemented." ++
[] \ No newline at end of file
diff --git a/src/GF/System/NoSignal.hs b/src/GF/System/NoSignal.hs
index 3c2fc6e29..bc0a9fc40 100644
--- a/src/GF/System/NoSignal.hs
+++ b/src/GF/System/NoSignal.hs
@@ -18,4 +18,8 @@ import Control.Exception (Exception)
{-# NOINLINE runInterruptibly #-}
runInterruptibly :: IO a -> IO (Either Exception a)
-runInterruptibly = fmap Right
+--runInterruptibly = fmap Right
+runInterruptibly a =
+ p `catch` h
+ where p = a >>= \x -> return $! Right $! x
+ h e = return $ Left e