Mercurial > dotfiles

changeset 131:a273867b6a0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 26 Sep 2013 22:28:15 -0700
parents bb4697ae7425 (current diff) 71f5975e7220 (diff)
children d190d7987730
files .hgsubstate vim/vimrc
diffstat 4 files changed, 19 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Tue Mar 05 13:27:49 2013 -0800
+++ b/.hgsubstate	Thu Sep 26 22:28:15 2013 -0700
@@ -9,11 +9,11 @@
 a0c71a6d4cb3b576ebbe42a270c8c48cbb23d185 vim/bundle/fugitive
 8c570a493d260890242cbdc5a22d8500dc4604cb vim/bundle/gundo
 9a891ed78a4b222e8c710e533e0d1f21259c0ef1 vim/bundle/haml
-75e9d909758accee9147116ec53c3d6e5e17ae3a vim/bundle/lawrencium
+8c9aca0e4322f56bce43204a172f9d18b67f0cc2 vim/bundle/lawrencium
 d605010cab695dca64c5cd9bf8bbcc8db9864815 vim/bundle/less
 dcdab0cd55da5e0b8655c000d99d96624cd6404c vim/bundle/markdown
 a1433c485eb254838c1db52e087d5ec4d1e77cfd vim/bundle/nerdtree
-0595eed8abef2641a659cac1830c592d20a5c440 vim/bundle/piecrust
+af8514b79c046a6bb447021b81351edb050ac69f vim/bundle/piecrust
 114f8e5c204f1cac9b2443065910fa182de39fb8 vim/bundle/powerline
 2f639ea61ab037e7862228d54a1c292f59c2385f vim/bundle/ragtag
 d75a544b786710705f0db0d8d8fd66ca4a5a7239 vim/bundle/repeat
--- a/hgrc/hgrc	Tue Mar 05 13:27:49 2013 -0800
+++ b/hgrc/hgrc	Thu Sep 26 22:28:15 2013 -0700
@@ -16,6 +16,7 @@
 convert =
 extdiff =
 schemes =
+histedit =
 graphlog =
 progress =
 parentrevspec =
--- a/hgrc/hgrc-MacOSX	Tue Mar 05 13:27:49 2013 -0800
+++ b/hgrc/hgrc-MacOSX	Thu Sep 26 22:28:15 2013 -0700
@@ -2,3 +2,6 @@
 cmd.opendiff = opendiff-w
 opts.opendiff =
 
+[ui]
+ssh = ssh -C
+
--- a/vim/vimrc	Tue Mar 05 13:27:49 2013 -0800
+++ b/vim/vimrc	Thu Sep 26 22:28:15 2013 -0700
@@ -29,11 +29,16 @@
 " Get our vim directory. 
 let s:vim_home = expand("<sfile>:h")
 
+" Make sure `filetype` stuff is turned off before loading Pathogen.
+syntax off
+filetype off
+
 " Disable some plugins.
 let g:pathogen_disabled = []
+call add(g:pathogen_disabled, 'vimroom')
 call add(g:pathogen_disabled, 'minibufexpl')
 call add(g:pathogen_disabled, 'ragtag')
-call add(g:pathogen_disabled, 'vimroom')
+call add(g:pathogen_disabled, 'fugitive')
 
 " Load pathogen.
 call pathogen#infect()
@@ -217,19 +222,23 @@
 " Ctrl-P should however ignore some stuff.
 let g:ctrlp_custom_ignore = {
   \ 'dir':  '\v[\/](\.git|\.hg|\.svn|venv)$',
-  \ 'file': '\.exe$\|\.so$\|\.dll$'
+  \ 'file': '\.exe$\|\.so$\|\.dll$|\.pyc$|\.pyo$'
   \ }
 
 " Make Ctrl-P cache stuff in our temp directory.
 let g:ctrlp_cache_dir = s:vim_home.'/cache'
 
-" Open Hg! commands in a normal buffer.
-let g:lawrencium_hg_bang_edit_command = 'edit'
+" Use `pyflakes` with `syntastic`.
+let g:syntastic_python_checker = 'pyflakes'
 
+" Custom Mercurial commands highlighting in Lawrencium.
 let g:lawrencium_hg_commands_file_types = {
             \'clog': 'hggraphlog'
             \}
 
+" Make the annotate window better in Lawrencium.
+let g:lawrencium_annotate_width_offset = 0
+
 " }}}
 
 " File-Specific Settings {{{