ea3fd4a6795a

--- a/.hgsub	Wed Jul 17 14:27:41 2013 -0400
+++ b/.hgsub	Thu Jul 18 00:49:44 2013 -0400
@@ -26,6 +26,7 @@
 vim/bundle/rainbow-parentheses   = [git]git://github.com/kien/rainbow_parentheses.vim.git
 vim/bundle/repeat                = [git]git://github.com/tpope/vim-repeat.git
 vim/bundle/scala                 = [git]git://github.com/derekwyatt/vim-scala.git
+vim/bundle/scaladoc              = [git]git://github.com/sjl/vim-scaladoc.git
 vim/bundle/smartinput            = [git]git://github.com/kana/vim-smartinput.git
 vim/bundle/sparkup               = [git]git://github.com/sjl/vim-sparkup.git
 vim/bundle/splice                = [hg]https://bitbucket.org/sjl/splice.vim

--- a/.hgsubstate	Wed Jul 17 14:27:41 2013 -0400
+++ b/.hgsubstate	Thu Jul 18 00:49:44 2013 -0400
@@ -26,6 +26,7 @@
 eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 vim/bundle/rainbow-parentheses
 613eb1c81261adfa5dead315089c432ff6dbbc51 vim/bundle/repeat
 c81f87ca6786142b531e66a948effacc03a02184 vim/bundle/scala
+1f797fda2c457202cf62d9a082a3fccd4278e3bf vim/bundle/scaladoc
 78ab4b3df24fa2753d3dfc1be75ed5a3df1565b8 vim/bundle/smartinput
 c6197a10ace82e0fe0c08e5cf5c017b7069a978e vim/bundle/sparkup
 01e68795c7a14b97ec2ebbd70b0fcb42d1adac61 vim/bundle/splice

--- a/mutt/muttrc	Wed Jul 17 14:27:41 2013 -0400
+++ b/mutt/muttrc	Thu Jul 18 00:49:44 2013 -0400
@@ -27,9 +27,10 @@
 
 source ~/.vim/bundle/badwolf/contrib/badwolf.muttrc
 
+set folder = ~/.mail/steve-stevelosh.com # mailbox location
+
 set wait_key = no        # shut up, mutt
 set mbox_type = Maildir  # mailbox type
-set folder = ~/.mail     # mailbox location
 set timeout = 3          # idle time before scanning
 set mail_check = 0       # minimum time between scans
 unset move               # gmail does that
@@ -120,20 +121,20 @@
 # steve@stevelosh.com {{{
 
 # Default inbox.
-set spoolfile = "+steve-stevelosh.com/INBOX"
+set spoolfile = "+INBOX"
 
 # Alternate email addresses.
 alternates sjl@pculture.org still\.?life@gmail.com steve@ladyluckblues.com steve@pculture.org
 
 # Mailboxes to show in the sidebar.
-mailboxes +steve-stevelosh.com/INBOX \
-          +steve-stevelosh.com/vim \
-          +steve-stevelosh.com/clojure \
-          +steve-stevelosh.com/python \
-          +steve-stevelosh.com/mercurial \
-          +steve-stevelosh.com/archive \
-          +steve-stevelosh.com/sent \
-          +steve-stevelosh.com/drafts \
+mailboxes +INBOX \
+          +vim \
+          +clojure \
+          +python \
+          +mercurial \
+          +archive \
+          +sent \
+          +drafts \
           +temporary/search \
 
 # Other special folders.

--- a/offlineimaprc	Wed Jul 17 14:27:41 2013 -0400
+++ b/offlineimaprc	Thu Jul 18 00:49:44 2013 -0400
@@ -1,18 +1,54 @@
 [general]
 ui = TTY.TTYUI
-accounts = Simple
+accounts = SteveLosh
 pythonfile=~/.mutt/offlineimap.py
 fsync = False
 
-# [Account SteveLosh]
-# localrepository = SteveLosh-Local
-# remoterepository = SteveLosh-Remote
+[Account SteveLosh]
+localrepository = SteveLosh-Local
+remoterepository = SteveLosh-Remote
+status_backend = sqlite
+postsynchook = notmuch new
+
+[Repository SteveLosh-Local]
+type = Maildir
+localfolders = ~/.mail/steve-stevelosh.com
+nametrans = lambda folder: {'drafts':  '[Gmail]/Drafts',
+                            'sent':    '[Gmail]/Sent Mail',
+                            'flagged': '[Gmail]/Starred',
+                            'trash':   '[Gmail]/Trash',
+                            'archive': '[Gmail]/All Mail',
+                            }.get(folder, folder)
+
+[Repository SteveLosh-Remote]
+maxconnections = 1
+type = Gmail
+remoteuser = steve@stevelosh.com
+remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com")
+realdelete = no
+nametrans = lambda folder: {'[Gmail]/Drafts':    'drafts',
+                            '[Gmail]/Sent Mail': 'sent',
+                            '[Gmail]/Starred':   'flagged',
+                            '[Gmail]/Trash':     'trash',
+                            '[Gmail]/All Mail':  'archive',
+                            }.get(folder, folder)
+folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
+                                             'Nagios',
+                                             'Django',
+                                             'Flask',
+                                             '[Gmail]/Important',
+                                             '[Gmail]/Spam',
+                                             ]
+
+# [Account Simple]
+# localrepository = Simple-Local
+# remoterepository = Simple-Remote
 # status_backend = sqlite
 # postsynchook = notmuch new
 # 
-# [Repository SteveLosh-Local]
+# [Repository Simple-Local]
 # type = Maildir
-# localfolders = ~/.mail/steve-stevelosh.com
+# localfolders = ~/.mail/simple
 # nametrans = lambda folder: {'drafts':  '[Gmail]/Drafts',
 #                             'sent':    '[Gmail]/Sent Mail',
 #                             'flagged': '[Gmail]/Starred',
@@ -20,11 +56,11 @@
 #                             'archive': '[Gmail]/All Mail',
 #                             }.get(folder, folder)
 # 
-# [Repository SteveLosh-Remote]
+# [Repository Simple-Remote]
 # maxconnections = 1
 # type = Gmail
-# remoteuser = steve@stevelosh.com
-# remotepasseval = get_keychain_pass(account="steve@stevelosh.com", server="imap.gmail.com")
+# remoteuser = sjl@simple.com
+# remotepasseval = get_keychain_pass(account="sjl@simple.com", server="imap.gmail.com")
 # realdelete = no
 # nametrans = lambda folder: {'[Gmail]/Drafts':    'drafts',
 #                             '[Gmail]/Sent Mail': 'sent',
@@ -33,42 +69,6 @@
 #                             '[Gmail]/All Mail':  'archive',
 #                             }.get(folder, folder)
 # folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
-#                                              'Nagios',
-#                                              'Django',
-#                                              'Flask',
 #                                              '[Gmail]/Important',
 #                                              '[Gmail]/Spam',
 #                                              ]
-
-[Account Simple]
-localrepository = Simple-Local
-remoterepository = Simple-Remote
-status_backend = sqlite
-postsynchook = notmuch new
-
-[Repository Simple-Local]
-type = Maildir
-localfolders = ~/.mail/simple
-nametrans = lambda folder: {'drafts':  '[Gmail]/Drafts',
-                            'sent':    '[Gmail]/Sent Mail',
-                            'flagged': '[Gmail]/Starred',
-                            'trash':   '[Gmail]/Trash',
-                            'archive': '[Gmail]/All Mail',
-                            }.get(folder, folder)
-
-[Repository Simple-Remote]
-maxconnections = 1
-type = Gmail
-remoteuser = sjl@simple.com
-remotepasseval = get_keychain_pass(account="sjl@simple.com", server="imap.gmail.com")
-realdelete = no
-nametrans = lambda folder: {'[Gmail]/Drafts':    'drafts',
-                            '[Gmail]/Sent Mail': 'sent',
-                            '[Gmail]/Starred':   'flagged',
-                            '[Gmail]/Trash':     'trash',
-                            '[Gmail]/All Mail':  'archive',
-                            }.get(folder, folder)
-folderfilter = lambda folder: folder not in ['[Gmail]/Trash',
-                                             '[Gmail]/Important',
-                                             '[Gmail]/Spam',
-                                             ]

--- a/vim/vimrc	Wed Jul 17 14:27:41 2013 -0400
+++ b/vim/vimrc	Thu Jul 18 00:49:44 2013 -0400
@@ -1029,6 +1029,9 @@
     au Filetype scala setlocal foldmethod=indent
     au Filetype scala compiler maven
     au Filetype scala let b:dispatch = 'mvn -B package install'
+    au Filetype scala nnoremap <buffer> <localleader>s :SortScalaImports<cr>
+    au Filetype scala nnoremap <buffer> M :call scaladoc#Search(expand("<cword>"))<cr>
+    au Filetype scala vnoremap <buffer> M "ry:call scaladoc#Search(@r)<cr>
 augroup END
 
 " }}}