From 64e29a11ba7a412fdc95dfbe792fa0f5f80bd43e Mon Sep 17 00:00:00 2001
From: Ryan Wang <wongyouth@gmail.com>
Date: Tue, 2 Apr 2013 09:43:41 +0800
Subject: [PATCH] add slim support

---
 README.md                    | 12 ++++++------
 after/plugin/handlebars.vim  |  2 ++
 after/plugin/slim.vim        |  2 ++
 after/plugin/tabular.vim     |  2 +-
 after/plugin/vim-css-hex.vim |  4 ++++
 bundle/vundle                |  2 +-
 gvimrc                       |  4 ++--
 7 files changed, 18 insertions(+), 10 deletions(-)
 create mode 100644 after/plugin/handlebars.vim
 create mode 100644 after/plugin/slim.vim
 create mode 100644 after/plugin/vim-css-hex.vim

diff --git a/README.md b/README.md
index 4d4e5b2..a983a64 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,9 @@ Make sure you have `exuberant-ctags` installed for using vim-ctags.
 
 ### File explorer
 
-* `<F4>`             - line number showing toggle
+* `<F3>`             - use word under cursor as pattern to find all matching in the current file
+* `<C-F3>`           - use word under cursor as pattern to replace all matching in the current file
+* `<F4>`             - line number showing toggle (normal mode)
 * `<F5>`             - undo history toggle
 * `<F6>`             - open current file's folder in NERDtree
 * `<F7>`             - toggle NERDTree window
@@ -65,8 +67,6 @@ Make sure you have `exuberant-ctags` installed for using vim-ctags.
 * `<F11>`            - exeucte `:only` to make current window maximized
 * `<c-k>`            - show buffer list
 * `<c-p>`            - features like Ctrl-p in textMate
-* `<F3>`             - use word under cursor as pattern to find all matching in the current file
-* `<C-F3>`           - use word under cursor as pattern to replace all matching in the current file
 * `:Ggrep <pattern>` - for searching pattern in all files under git managed, `]q` open next matching, `[q` open previous matching, `[Q`, `]Q` for the first and last matching
 
 ### doc explorer
@@ -84,12 +84,12 @@ Make sure you have `exuberant-ctags` installed for using vim-ctags.
 
 ### Formatting
 
-* `<F4>`  - toggle paste mode
+* `<F4>`  - toggle paste mode (insert mode)
 * `<F5>`  - toggle Gundo window (history window)
-* `<F12>` - toggle mouse
+* `<F12>` - toggle mouse (for terminal vim)
 
 * `\cc`       - comment out
-* `\c<SPACE>` - revert comment out
+* `\c<SPACE>` - reverting comment out
 
 * `\ff` - javascript formatting
 
diff --git a/after/plugin/handlebars.vim b/after/plugin/handlebars.vim
new file mode 100644
index 0000000..e1c264c
--- /dev/null
+++ b/after/plugin/handlebars.vim
@@ -0,0 +1,2 @@
+autocmd BufNewFile,BufRead *.hbs set filetype=handlebars
+
diff --git a/after/plugin/slim.vim b/after/plugin/slim.vim
new file mode 100644
index 0000000..6e69449
--- /dev/null
+++ b/after/plugin/slim.vim
@@ -0,0 +1,2 @@
+autocmd BufNewFile,BufRead *.slimbars set filetype=slim
+
diff --git a/after/plugin/tabular.vim b/after/plugin/tabular.vim
index aedb3be..127c3b8 100644
--- a/after/plugin/tabular.vim
+++ b/after/plugin/tabular.vim
@@ -2,6 +2,6 @@ noremap <leader>a,  :Tabularize /,<cr>
 noremap <leader>a#  :Tabularize /#<cr>
 noremap <leader>a=  :Tabularize /=<cr>
 noremap <leader>a== :Tabularize /==<cr>
-noremap <leader>a:  :Tabularize /:/r0c0l1<cr>
+noremap <leader>a:  :Tabularize /:<cr>
 noremap <leader>a\|  :Tabularize /\|<cr>
 noremap <leader>a>  :Tabularize /=><cr>
diff --git a/after/plugin/vim-css-hex.vim b/after/plugin/vim-css-hex.vim
new file mode 100644
index 0000000..2c70740
--- /dev/null
+++ b/after/plugin/vim-css-hex.vim
@@ -0,0 +1,4 @@
+au BufEnter *.css,*.scss,*.sass,*.less call HexHighlight()
+au InsertLeave *.css,*.scss,*.sass,*.less call HexHighlight()
+au CursorMoved *.css,*.scss,*.sass,*.less call HexHighlight()
+au CursorMovedI *.css,*.scss,*.sass,*.less call HexHighlight()
diff --git a/bundle/vundle b/bundle/vundle
index 3bf598d..3dcb0c3 160000
--- a/bundle/vundle
+++ b/bundle/vundle
@@ -1 +1 @@
-Subproject commit 3bf598d169993d703c21115876c36e460a51b100
+Subproject commit 3dcb0c32991026d0d226aaad57b622c6553cd0db
diff --git a/gvimrc b/gvimrc
index 7f022d4..1346929 100644
--- a/gvimrc
+++ b/gvimrc
@@ -1,10 +1,10 @@
 "set guifont
 if has("gui_macvim")
   "for mac
-  set guifont=Monaco:h13
+  set guifont=Monaco:h16
 else
   "for ubuntu
-  set guifont=Monospace\ 11
+  set guifont=Monospace\ 12
 endif
 
 "colorscheme: blackboard github solarized