From 734348d4e011048c98975fbdedc810349b985871 Mon Sep 17 00:00:00 2001
From: "sean.escriva" <sean.escriva@gmail.com>
Date: Wed, 1 Jul 2009 23:56:40 +0200
Subject: Cleanup code duplication in X.P.Layout and X.P.Workspace
Ignore-this: 8675be8952f8d100c9042bdcdb962d3a
darcs-hash:20090701215640-29414-635465e7306088202cdbe0bc5251811c9c7b5d73.gz
---
XMonad/Prompt/Layout.hs | 5 +----
XMonad/Prompt/Workspace.hs | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/XMonad/Prompt/Layout.hs b/XMonad/Prompt/Layout.hs
index 492cc07..706b382 100644
--- a/XMonad/Prompt/Layout.hs
+++ b/XMonad/Prompt/Layout.hs
@@ -50,7 +50,4 @@ instance XPrompt Wor where
layoutPrompt :: XPConfig -> X ()
layoutPrompt c = do ls <- gets (map (description . layout) . workspaces . windowset)
- mkXPrompt (Wor "") c (mkCompl $ sort $ nub ls) (sendMessage . JumpToLayout)
-
-mkCompl :: [String] -> String -> IO [String]
-mkCompl l s = return $ filter (\x -> take (length s) x == s) l
+ mkXPrompt (Wor "") c (mkComplFunFromList' $ sort $ nub ls) (sendMessage . JumpToLayout)
diff --git a/XMonad/Prompt/Workspace.hs b/XMonad/Prompt/Workspace.hs
index 165eba9..c1820d4 100644
--- a/XMonad/Prompt/Workspace.hs
+++ b/XMonad/Prompt/Workspace.hs
@@ -43,7 +43,4 @@ workspacePrompt :: XPConfig -> (String -> X ()) -> X ()
workspacePrompt c job = do ws <- gets (workspaces . windowset)
sort <- getSortByIndex
let ts = map tag $ sort ws
- mkXPrompt (Wor "") c (mkCompl ts) job
-
-mkCompl :: [String] -> String -> IO [String]
-mkCompl l s = return $ filter (\x -> take (length s) x == s) l
+ mkXPrompt (Wor "") c (mkComplFunFromList' ts) job
--
cgit v1.2.3