Mercurial > dotfiles
changeset 271:79a64ef88a6b
Merge
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Mon, 12 Dec 2011 11:47:34 -0600 (2011-12-12) |
parents | 1e2125a577da (current diff) 393535e99b8a (diff) |
children | 02b635053e8f |
files | .elisp/settings/50.preferences.el |
diffstat | 4 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/.elisp/settings/10.require.el +++ b/.elisp/settings/10.require.el @@ -30,3 +30,5 @@ (require 'nose) (require 'http-twiddle) + +(require 'js2-mode)
--- 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))
--- 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
--- 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)