# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1323712054 21600
# Node ID 79a64ef88a6b46651f350ddd1d728ceb51f4fde6
# Parent  1e2125a577da7c1ca84cf2f7c80d8c05e70a72c4# Parent  393535e99b8a4ef15e56ac67280fb045440fd8d3
Merge

diff --git a/.elisp/settings/10.require.el b/.elisp/settings/10.require.el
--- a/.elisp/settings/10.require.el
+++ b/.elisp/settings/10.require.el
@@ -30,3 +30,5 @@
 
 (require 'nose)
 (require 'http-twiddle)
+
+(require 'js2-mode)
diff --git a/.elisp/settings/50.preferences.el b/.elisp/settings/50.preferences.el
--- a/.elisp/settings/50.preferences.el
+++ b/.elisp/settings/50.preferences.el
@@ -65,8 +65,11 @@
     (set-face-attribute 'default nil :height 100)))
 )
 (af-gui-init)
+
 ;; use y or n instead of yes or no
 (fset 'yes-or-no-p 'y-or-n-p)
+;; Enable narrow-to-region, which is disabled by default
+(put 'narrow-to-region 'disabled nil)
 
 ;; whitespace detection
 (setq whitespace-style '(trailing tabs lines-tail indentation trailing empty))
diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -23,6 +23,7 @@ hg_remotebranches=
 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
 utip = log -r 'limit(heads(upstream()), 1)'
+egrep = !$HG locate -0 '$2' $3 $4 $5 $6 $7 $8 $9 | xargs -0 egrep -H '$1'
 
 wc-out = log -r 'ancestors(.) and not upstream()'
 wc-email = email -r 'ancestors(.) and not upstream()'
@@ -62,9 +63,3 @@ hgcrew = http://hg.intevation.org/mercur
 hgsubv = ssh://hg@bitbucket.org/durin42/hgsubversion/
 hggit = ssh://hg@bitbucket.org/durin42/hg-git/
 histedit = ssh://hg@bitbucket.org/durin42/histedit/
-
-[hooks]
-# Prevent "hg pull" if MQ patches are applied.
-#prechangegroup.mq-no-pull = ! hg qtop > /dev/null 2>&1
-# Prevent "hg push" if MQ patches are applied.
-#preoutgoing.mq-no-push = ! hg qtop > /dev/null 2>&1
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -3,6 +3,7 @@ import XMonad
 import XMonad
 import XMonad.Config.Gnome
 import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.ICCCMFocus
 import XMonad.Layout
 import XMonad.Layout.Column
 import XMonad.Layout.LayoutBuilder
@@ -26,6 +27,7 @@ main = do
        { terminal = "urxvt -sr -bg Black -fg White"
        , modMask = mod4Mask
        , layoutHook = avoidStruts myLayout
+       , logHook = takeTopFocus
        } `additionalKeys` [
          ((mod4Mask, xK_a), spawn "gnome-screensaver-command --lock")
        , ((mod4Mask, xK_p), spawn myDmenuTitleBar)