summaryrefslogtreecommitdiff
path: root/src/GF/Shell
diff options
context:
space:
mode:
authoraarne <unknown>2004-08-13 20:46:54 +0000
committeraarne <unknown>2004-08-13 20:46:54 +0000
commit1142d18a08cb8b9b96aefbd52fdadb05cb1982c7 (patch)
treed3a7c3242b7687cccfe30793d0cf7a1aca636ed0 /src/GF/Shell
parent69aa3248d2ea878ef45e9e8c177381730d949c32 (diff)
-s
Diffstat (limited to 'src/GF/Shell')
-rw-r--r--src/GF/Shell/Commands.hs5
-rw-r--r--src/GF/Shell/JGF.hs2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/GF/Shell/Commands.hs b/src/GF/Shell/Commands.hs
index adc023a3d..4b0b3f82d 100644
--- a/src/GF/Shell/Commands.hs
+++ b/src/GF/Shell/Commands.hs
@@ -126,11 +126,11 @@ execCommand env c s = case c of
-- these commands do need IO
CCEnvImport file -> useIOE (env,s) $ do
- st <- shellStateFromFiles opts env file
+ st <- shellStateFromFiles optss env file
return (st,s)
CCEnvEmptyAndImport file -> useIOE (emptyShellState, initSState) $ do
- st <- shellStateFromFiles opts emptyShellState file
+ st <- shellStateFromFiles optss emptyShellState file
return (startEditEnv st,initSState)
CCEnvEmpty -> do
@@ -180,6 +180,7 @@ execCommand env c s = case c of
gr = grammarCEnv env
cgr = canCEnv env
opts = globalOptions env
+ optss = addOption beSilent opts
-- format for documents:
-- GF commands of form "-- command", then term or text
diff --git a/src/GF/Shell/JGF.hs b/src/GF/Shell/JGF.hs
index f1ed6bfb7..916d0fafd 100644
--- a/src/GF/Shell/JGF.hs
+++ b/src/GF/Shell/JGF.hs
@@ -21,7 +21,7 @@ import UTF8
sessionLineJ :: Bool -> ShellState -> IO ()
sessionLineJ isNew env = do
putStrLnFlush $ initEditMsgJavaX env
- let env' = addGlobalOptions (options [sizeDisplay "short"]) env
+ let env' = addGlobalOptions (options [sizeDisplay "short",beSilent]) env
editLoopJnewX isNew env' (initSState)
-- this is the real version, with XML