Be consistent with core utf8-string usage.

Ignore-this: 9de0599d0fb888c58e11598d4de9599e

Now that spawn assumes executeFile takes a String containing utf8 codepoints
(and takes an actual String as input) adjust Prompt.Shell to avoid double
encoding. U.Run functions are updated to be consistent with spawn.

darcs-hash:20111118184745-1499c-0f5bee188cc9540d2747db1adbf87619011a5443.gz

1 files changed, 3 insertions, 3 deletions

diff --git a/XMonad/Prompt/Shell.hs b/XMonad/Prompt/Shell.hs
index da55f48..8dd151c 100644
--- a/XMonad/Prompt/Shell.hs
+++ b/XMonad/Prompt/Shell.hs
@@ -62,7 +62,7 @@ instance XPrompt Shell where
 shellPrompt :: XPConfig -> X ()
 shellPrompt c = do
     cmds <- io getCommands
-    mkXPrompt Shell c (getShellCompl cmds) (spawn . encodeString)
+    mkXPrompt Shell c (getShellCompl cmds) spawn
 
 {- | See safe and unsafeSpawn. prompt is an alias for safePrompt;
     safePrompt and unsafePrompt work on the same principles, but will use
@@ -81,9 +81,9 @@ shellPrompt c = do
 prompt, unsafePrompt, safePrompt :: FilePath -> XPConfig -> X ()
 prompt = unsafePrompt
 safePrompt c config = mkXPrompt Shell config (getShellCompl [c]) run
-    where run = safeSpawn c . return . encodeString
+    where run = safeSpawn c . return
 unsafePrompt c config = mkXPrompt Shell config (getShellCompl [c]) run
-    where run a = unsafeSpawn $ c ++ " " ++ encodeString a
+    where run a = unsafeSpawn $ c ++ " " ++ a
 
 getShellCompl :: [String] -> String -> IO [String]
 getShellCompl cmds s | s == "" || last s == ' ' = return []