This commit is contained in:
aarne
2004-08-13 20:46:54 +00:00
parent 69aa3248d2
commit 1142d18a08
6 changed files with 11 additions and 8 deletions

View File

@@ -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

View File

@@ -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