darcs patch: Config.hs: rm commented out keybinding (... (and 2 more)

3 patches for repository community.haskell.org:/srv/code/xmonad: Thu Jan 12 19:01:15 EST 2012 gwern0@gmail.com * Config.hs: rm commented out keybinding (dead for years) Thu Jan 12 20:04:10 EST 2012 gwern0@gmail.com * Config.hs: implement mod-shift-/ newbie keybinding guide per http://code.google.com/p/xmonad/issues/detail?id=182 Sun May 13 17:15:22 EDT 2012 gwern0@gmail.com * HCAR.tex: update per Janis

Hi Gwern,
Do you have an explanation for why "XMonad.Config.PlainConfig" in
HCAR.tex is re-added in your patch? My reason for having deleted it is
explained in this patch:
Sat Dec 10 19:44:05 EST 2011 Adam Vogt
3 patches for repository community.haskell.org:/srv/code/xmonad:
Thu Jan 12 19:01:15 EST 2012 gwern0@gmail.com * Config.hs: rm commented out keybinding (dead for years)
Thu Jan 12 20:04:10 EST 2012 gwern0@gmail.com * Config.hs: implement mod-shift-/ newbie keybinding guide per http://code.google.com/p/xmonad/issues/detail?id=182
Sun May 13 17:15:22 EDT 2012 gwern0@gmail.com * HCAR.tex: update per Janis
[Config.hs: rm commented out keybinding (dead for years) gwern0@gmail.com**20120113000115 Ignore-this: 642850f63b8c9cd44102e9883178d475 ] hunk ./XMonad/Config.hs 200 , ((modMask , xK_comma ), sendMessage (IncMasterN 1)) -- %! Increment the number of windows in the master area , ((modMask , xK_period), sendMessage (IncMasterN (-1))) -- %! Deincrement the number of windows in the master area
- - -- toggle the status bar gap - - --, ((modMask , xK_b ), modifyGap (\i n -> let x = (XMonad.defaultGaps conf ++ repeat (0,0,0,0)) !! i in if n == x then (0,0,0,0) else x)) -- %! Toggle the status bar gap - - -- quit, or restart , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- %! Quit xmonad , ((modMask , xK_q ), spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi") -- %! Restart xmonad [Config.hs: implement mod-shift-/ newbie keybinding guide per http://code.google.com/p/xmonad/issues/detail?id=182 gwern0@gmail.com**20120113010410 Ignore-this: bdfa33d3d06d7cf67fe689421f30a0ca ] { hunk ./XMonad/Config.hs 203 -- quit, or restart , ((modMask .|. shiftMask, xK_q ), io (exitWith ExitSuccess)) -- %! Quit xmonad , ((modMask , xK_q ), spawn "if type xmonad; then xmonad --recompile && xmonad --restart; else xmessage xmonad not in \\$PATH: \"$PATH\"; fi") -- %! Restart xmonad + + , ((modMask .|. shiftMask, xK_slash ), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) -- %! Run xmessage with a summary of the default keybindings (useful for beginners) + -- repeat the binding for non-American layout keyboards + , ((modMask , xK_question), spawn ("echo \"" ++ help ++ "\" | xmessage -file -")) ] ++ -- mod-[1..9] %! Switch to workspace N hunk ./XMonad/Config.hs 222 , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
-- | Mouse bindings: default actions bound to mouse events - --- mouseBindings :: XConfig Layout -> M.Map (KeyMask, Button) (Window -> X ()) mouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList -- mod-button1 %! Set the window to floating mode and move by dragging hunk ./XMonad/Config.hs 235 -- you may also bind events to the mouse scroll wheel (button4 and button5) ]
- --- | And, finally, the default set of configuration values itself +-- | The default set of configuration values itself defaultConfig = XConfig { XMonad.borderWidth = borderWidth , XMonad.workspaces = workspaces hunk ./XMonad/Config.hs 253 , XMonad.focusFollowsMouse = focusFollowsMouse }
+-- | Finally, a copy of the default bindings in simple textual tabular format. +help :: String +help = unlines ["The default modifier key is 'alt'. Default keybindings:", + "", + "-- launching and killing programs", + "mod-Shift-Enter Launch xterminal", + "mod-p Launch dmenu", + "mod-Shift-p Launch gmrun", + "mod-Shift-c Close/kill the focused window", + "mod-Space Rotate through the available layout algorithms", + "mod-Shift-Space Reset the layouts on the current workSpace to default", + "mod-n Resize/refresh viewed windows to the correct size", + "", + "-- move focus up or down the window stack", + "mod-Tab Move focus to the next window", + "mod-Shift-Tab Move focus to the previous window", + "mod-j Move focus to the next window", + "mod-k Move focus to the previous window", + "mod-m Move focus to the master window", + "", + "-- modifying the window order", + "mod-Return Swap the focused window and the master window", + "mod-Shift-j Swap the focused window with the next window", + "mod-Shift-k Swap the focused window with the previous window", + "", + "-- resizing the master/slave ratio", + "mod-h Shrink the master area", + "mod-l Expand the master area", + "", + "-- floating layer support", + "mod-t Push window back into tiling; unfloat and re-tile it", + "", + "-- increase or decrease number of windows in the master area", + "mod-comma (mod-,) Increment the number of windows in the master area", + "mod-period (mod-.) Deincrement the number of windows in the master area", + "", + "-- quit, or restart", + "mod-Shift-q Quit xmonad", + "mod-q Restart xmonad", + "mod-[1..9] Switch to workSpace N", + "", + "-- Workspaces & screens", + "mod-Shift-[1..9] Move client to workspace N", + "mod-{w,e,r} Switch to physical/Xinerama screens 1, 2, or 3", + "mod-Shift-{w,e,r} Move client to screen 1, 2, or 3", + "", + "-- Mouse bindings: default actions bound to mouse events", + "mod-button1 Set the window to floating mode and move by dragging", + "mod-button2 Raise the window to the top of the stack", + "mod-button3 Set the window to floating mode and resize by dragging"] } [HCAR.tex: update per Janis gwern0@gmail.com**20120513211522 Ignore-this: 93bd070d5c48838ab65d75881766363 ] { hunk ./man/HCAR.tex 2 % xmonad-Gx.tex - -\begin{hcarentry}[updated]{xmonad} +\begin{hcarentry}{xmonad} \label{xmonad} \report{Gwern Branwen}%11/11 \status{active development} hunk ./man/HCAR.tex 31 \item \url{http://haskell.org/haskellwiki/Xmonad/Notable_changes_since_0.9} % \item \url{http://haskell.org/haskellwiki/Xmonad/Notable_changes_since_0.10} \item the Darcs repositories have been upgraded to the hashed format +\item XMonad.Config.PlainConfig allows writing configs in a more 'normal' style, and not raw Haskell \item Supports using local modules in xmonad.hs; for example: to use definitions from \~/.xmonad/lib/XMonad/Stack/MyAdditions.hs \item xmonad --restart CLI option \item xmonad --replace CLI option }
_______________________________________________ xmonad mailing list xmonad@haskell.org http://www.haskell.org/mailman/listinfo/xmonad

On Tue, May 15, 2012 at 9:04 PM, adam vogt
Do you have an explanation for why "XMonad.Config.PlainConfig" in HCAR.tex is re-added in your patch? My reason for having deleted it is explained in this patch:
I recorded the new version exactly as Janis sent it to me, modulo converting to Unix line-endings. -- gwern http://www.gwern.net
participants (3)
-
adam vogt
-
Gwern Branwen
-
gwern0@gmail.com