diff options
| -rw-r--r-- | XMonad/Prompt/Man.hs | 2 | ||||
| -rw-r--r-- | XMonad/Prompt/Ssh.hs | 2 | ||||
| -rw-r--r-- | XMonad/Util/Run.hs | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/XMonad/Prompt/Man.hs b/XMonad/Prompt/Man.hs index 71c7dbd..20e282d 100644 --- a/XMonad/Prompt/Man.hs +++ b/XMonad/Prompt/Man.hs @@ -58,7 +58,7 @@ instance XPrompt Man where manPrompt :: XPConfig -> X () manPrompt c = do mans <- io getMans - mkXPrompt Man c (manCompl mans) $ runInTerm . (++) "man " + mkXPrompt Man c (manCompl mans) $ runInTerm "" . (++) "man " getMans :: IO [String] getMans = do diff --git a/XMonad/Prompt/Ssh.hs b/XMonad/Prompt/Ssh.hs index 47ba168..379de4c 100644 --- a/XMonad/Prompt/Ssh.hs +++ b/XMonad/Prompt/Ssh.hs @@ -56,7 +56,7 @@ sshPrompt c = do mkXPrompt Ssh c (mkComplFunFromList sc) ssh ssh :: String -> X () -ssh s = runInTerm ("ssh " ++ s) +ssh s = runInTerm "" ("ssh " ++ s) sshComplList :: IO [String] sshComplList = uniqSort `fmap` liftM2 (++) sshComplListLocal sshComplListGlobal diff --git a/XMonad/Util/Run.hs b/XMonad/Util/Run.hs index face2d8..1f544f2 100644 --- a/XMonad/Util/Run.hs +++ b/XMonad/Util/Run.hs @@ -56,7 +56,7 @@ runProcessWithInput cmd args input = do hPutStr pin input hClose pin output <- hGetContents pout - when (output==output) $ return () + when (output == output) $ return () hClose pout hClose perr waitForProcess ph @@ -112,11 +112,11 @@ unsafeSpawn = spawn -- | Run a given program in the preferred terminal emulator. This uses -- 'safeSpawn'. -safeRunInTerm :: String -> X () -safeRunInTerm command = asks (terminal . config) >>= \t -> safeSpawn t ("-e " ++ command) +safeRunInTerm :: String -> String -> X () +safeRunInTerm options command = asks (terminal . config) >>= \t -> safeSpawn t (options ++ " -e " ++ command) -unsafeRunInTerm, runInTerm :: String -> X () -unsafeRunInTerm command = asks (terminal . config) >>= \t -> unsafeSpawn $ t ++ " -e " ++ command +unsafeRunInTerm, runInTerm :: String -> String -> X () +unsafeRunInTerm options command = asks (terminal . config) >>= \t -> unsafeSpawn $ t ++ " " ++ options ++ " -e " ++ command runInTerm = unsafeRunInTerm -- | Launch an external application and return a 'Handle' to its standard input. |