# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1295716411 18000
# Node ID 4537dbfc929a2f484fc57bf0af34d5e9de0d6ef3
# Parent  387e93c23520065a69e55e2a7e827cbc5dd7a77f# Parent  41980dc5753f99711488a4bb8f1c846dbb5361e4
Merge.

diff -r 387e93c23520 -r 4537dbfc929a .ctags
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.ctags	Sat Jan 22 12:13:31 2011 -0500
@@ -0,0 +1,9 @@
+--python-kinds=-iv
+--langdef=js
+--langmap=js:.js
+--regex-js=/([A-Za-z0-9._$]+)[ \t]*[:=][ \t]*\{/\1/,object/
+--regex-js=/([A-Za-z0-9._$()]+)[ \t]*[:=][ \t]*function[ \t]*\(/\1/,function/
+--regex-js=/function[ \t]+([A-Za-z0-9._$]+)[ \t]*([^)])/\1/,function/
+--regex-js=/([A-Za-z0-9._$]+)[ \t]*[:=][ \t]*\[/\1/,array/
+--regex-js=/([^= ]+)[ \t]*=[ \t]*[^"]'[^']*/\1/,string/
+--regex-js=/([^= ]+)[ \t]*=[ \t]*[^']"[^"]*/\1/,string/
diff -r 387e93c23520 -r 4537dbfc929a .hgrc
--- a/.hgrc	Sat Jan 22 12:13:16 2011 -0500
+++ b/.hgrc	Sat Jan 22 12:13:31 2011 -0500
@@ -40,6 +40,7 @@
 stable = ssh://hg@bitbucket.org/stable/
 dwd = ssh://hg@bitbucket.org/dwaiter/
 nyh = ssh://sjl@gotham.nyhacker.org/
+dl = ssh://hg@hg.dwaiter.com:38038/
 
 [diff]
 git = True
diff -r 387e93c23520 -r 4537dbfc929a .hgsub
--- a/.hgsub	Sat Jan 22 12:13:16 2011 -0500
+++ b/.hgsub	Sat Jan 22 12:13:31 2011 -0500
@@ -9,3 +9,4 @@
 vim/bundle/surround = [git]git://github.com/tpope/vim-surround.git
 vim/bundle/syntastic = [git]git://github.com/scrooloose/syntastic.git
 vim/bundle/vim-coffee-script = [git]git://github.com/kchmck/vim-coffee-script.git
+vim/bundle/vim-javascript = [git]git://github.com/pangloss/vim-javascript.git
diff -r 387e93c23520 -r 4537dbfc929a .hgsubstate
--- a/.hgsubstate	Sat Jan 22 12:13:16 2011 -0500
+++ b/.hgsubstate	Sat Jan 22 12:13:31 2011 -0500
@@ -8,4 +8,5 @@
 27710a2224d6dd0486d1c40d09ef18dd752e7d37 vim/bundle/surround
 4b690ba5e20fd603986df9563614909442b4086c vim/bundle/syntastic
 b9b4407a19acc4eb344cca0cc5beea75e9ff5491 vim/bundle/vim-coffee-script
+c2df2e430d7d5fe645aa40e36079ab51f082e06b vim/bundle/vim-javascript
 94293727a5d47cb3cca3a32069f86eb42cbc0bf6 vim/sadness/sparkup
diff -r 387e93c23520 -r 4537dbfc929a mutt/muttrc
--- a/mutt/muttrc	Sat Jan 22 12:13:16 2011 -0500
+++ b/mutt/muttrc	Sat Jan 22 12:13:31 2011 -0500
@@ -84,36 +84,38 @@
 source ~/.mutt/sidebar.muttrc                                   # any muttng options are here
 
 # account specific sources
-folder-hook steve-stevelosh.com/* source ~/.mutt/steve-stevelosh.com.muttrc
+folder-hook steve-stevelosh.com/*        source ~/.mutt/steve-stevelosh.com.muttrc
 folder-hook steve-dumbwaiterdesign.com/* source ~/.mutt/steve-dumbwaiterdesign.com.muttrc
 
 # these just give me headaches
-bind index,pager \#     noop
-bind index i            noop
+bind index,pager \# noop
+bind index i        noop
 
 # bindings
-bind index l            previous-entry
-bind index k            next-entry
-bind pager i            exit
-bind pager /            search
-bind pager l            previous-line
-bind pager k            next-line
-bind pager gg           top
-bind pager G            bottom
-bind index gg           first-entry
-bind index G            last-entry
-bind pager L            previous-undeleted
-bind pager K            next-undeleted
-bind index L            previous-unread
-bind index K            next-unread
-bind index,pager R      group-reply
+bind index \#       sync-mailbox
+bind index l        previous-entry
+bind index k        next-entry
+bind pager i        exit
+bind pager /        search
+bind pager l        previous-line
+bind pager k        next-line
+bind pager gg       top
+bind pager G        bottom
+bind index gg       first-entry
+bind index G        last-entry
+bind pager L        previous-undeleted
+bind pager K        next-undeleted
+bind index L        previous-unread
+bind index K        next-unread
+bind index,pager R  group-reply
 
 # macros
-macro index \Cr "<tag-prefix><clear-flag>N"                                 "mark tagged messages as read"
-macro index \CR "T.<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
-macro index B   "<limit>~b "                                                "search message bodies"
-macro index I   "<change-folder>!<enter>"                                   "go to Inbox"
-macro pager \Cu |urlview<enter>                                             "call urlview to extract URLs out of a message"
+macro index \Cr   "<tag-prefix><clear-flag>N"                                          "mark tagged messages as read"
+macro index \CR   "T.<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>"          "mark all messages as read"
+macro index B     "<limit>~b "                                                         "search message bodies"
+macro index I     "<change-folder>!<enter>"                                            "go to Inbox"
+macro pager \Cu   "|urlview<enter>"                                                    "call urlview to extract URLs out of a message"
+macro index,pager o     "|mvim -c 'setlocal ft=mail' -c 'setlocal buftype=nofile' -<enter>"  "open in vim"
 
 # mailbox
 macro index ( "<change-folder>+steve-stevelosh.com/INBOX<enter>"          "go to stevelosh/INBOX"
diff -r 387e93c23520 -r 4537dbfc929a vim/.vimrc
--- a/vim/.vimrc	Sat Jan 22 12:13:16 2011 -0500
+++ b/vim/.vimrc	Sat Jan 22 12:13:31 2011 -0500
@@ -113,6 +113,7 @@
 set foldlevelstart=0
 nnoremap <Space> za
 vnoremap <Space> za
+nnoremap zO zCzO
 
 function! MyFoldText()
     let line = getline(v:foldstart)