diff options
| -rw-r--r-- | Main.hs | 6 | ||||
| -rw-r--r-- | XMonad/Config.hs | 2 | ||||
| -rw-r--r-- | XMonad/Core.hs | 3 | ||||
| -rw-r--r-- | XMonad/StackSet.hs | 4 |
4 files changed, 15 insertions, 0 deletions
@@ -62,11 +62,17 @@ usage = do -- | Build "~/.xmonad/xmonad.hs" with ghc, then execute it. If there are no -- errors, this function does not return. An exception is raised in any of -- these cases: +-- -- * ghc missing +-- -- * ~/.xmonad/xmonad.hs missing +-- -- * xmonad.hs fails to compile +-- -- ** wrong ghc in path (fails to compile) +-- -- ** type error, syntax error, .. +-- -- * Missing xmonad/XMonadContrib modules due to ghc upgrade -- buildLaunch :: IO () diff --git a/XMonad/Config.hs b/XMonad/Config.hs index fa7bd90..52c04af 100644 --- a/XMonad/Config.hs +++ b/XMonad/Config.hs @@ -109,7 +109,9 @@ manageHook = composeAll -- | Perform an arbitrary action on each internal state change or X event. -- Examples include: +-- -- * do nothing +-- -- * log the state to stdout -- -- See the 'DynamicLog' extension for examples. diff --git a/XMonad/Core.hs b/XMonad/Core.hs index 1006092..e59d3e7 100644 --- a/XMonad/Core.hs +++ b/XMonad/Core.hs @@ -367,8 +367,11 @@ getXMonadDir = io $ getAppUserDataDirectory "xmonad" -- | 'recompile force', recompile @~\/.xmonad\/xmonad.hs@ when any of the -- following apply: +-- -- * force is True +-- -- * the xmonad executable does not exist +-- -- * the xmonad executable is older than xmonad.hs -- -- The -i flag is used to restrict recompilation to the xmonad.hs file only. diff --git a/XMonad/StackSet.hs b/XMonad/StackSet.hs index 4fed2eb..7674a44 100644 --- a/XMonad/StackSet.hs +++ b/XMonad/StackSet.hs @@ -459,13 +459,17 @@ insertUp a s = if member a s then s else insert -- There are 4 cases to consider: -- -- * delete on an Nothing workspace leaves it Nothing +-- -- * otherwise, try to move focus to the down +-- -- * otherwise, try to move focus to the up +-- -- * otherwise, you've got an empty workspace, becomes Nothing -- -- Behaviour with respect to the master: -- -- * deleting the master window resets it to the newly focused window +-- -- * otherwise, delete doesn't affect the master. -- delete :: (Ord a, Eq s) => a -> StackSet i l a s sd -> StackSet i l a s sd |