twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-07 23:41:52 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use the new getXMonadCacheDir function from #62

Browse Source 
Prompt should have been using getXMonadDir this entire time but since
we now have getXMonadCacheDir use that instead.  This brings
xmonad-contrib inline with the changes in #62.

This also fixes xmonad/xmonad-contrib#68
This commit is contained in:
Peter Jones
2017-01-04 14:39:00 -07:00
parent 77e5e5190d
commit 74b281b5d3
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
XMonad/Prompt.hs
View File

@@ -91,7 +91,6 @@ import Data.List
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Data.Set (fromList, toList) import Data.Set (fromList, toList)
import System.Directory (getAppUserDataDirectory)
import System.IO import System.IO
import System.Posix.Files import System.Posix.Files
@@ -1064,7 +1063,7 @@ emptyHistory :: History
emptyHistory = M.empty emptyHistory = M.empty
getHistoryFile :: IO FilePath getHistoryFile :: IO FilePath
getHistoryFile = fmap (++ "/history") $ getAppUserDataDirectory "xmonad" getHistoryFile = fmap (++ "/prompt-history") getXMonadCacheDir
readHistory :: IO History readHistory :: IO History
readHistory = readHist `E.catch` \(SomeException _) -> return emptyHistory readHistory = readHist `E.catch` \(SomeException _) -> return emptyHistory
@@ -1170,7 +1169,7 @@ breakAtSpace s
-- | 'historyCompletion' provides a canned completion function much like -- | 'historyCompletion' provides a canned completion function much like
-- 'getShellCompl'; you pass it to mkXPrompt, and it will make completions work -- 'getShellCompl'; you pass it to mkXPrompt, and it will make completions work
-- from the query history stored in ~\/.xmonad\/history. -- from the query history stored in the XMonad cache directory.
historyCompletion :: ComplFunction historyCompletion :: ComplFunction
historyCompletion = historyCompletionP (const True) historyCompletion = historyCompletionP (const True)