Permalink
Browse files

I reinstalled OSX over the last couple of days and these were sitting…

… uncommitted... not sure why... gotta pull and resolve after this
  • Loading branch information...
1 parent 56df4f3 commit a5af27fd931f00617bcc16997978c93b197d663d Derek Wyatt committed Dec 31, 2011
Showing with 15 additions and 4 deletions.
  1. +1 −0 .gitignore
  2. +3 −3 after/ftplugin/cpp.vim
  3. +1 −0 bundle/from_github.md
  4. +9 −0 bundle/get
  5. +1 −1 vimrc
View
@@ -22,5 +22,6 @@ vim-json
vim-signs
vim-mwutils
vim-completion
+vim-orgmode
*.swp
passwords.vim
View
@@ -461,8 +461,8 @@ augroup local_ftplugin_cpp
au BufWinEnter,BufEnter *.h,*.cpp :lcd %:h
" Settings for the FSwitch plugin
" See http://www.vim.org/scripts/script.php?script_id=2590
- au BufEnter *.cpp let b:fswitchlocs = 'reg:/src/include/,reg:|src|include/**|,../include'
- au BufEnter *.h let b:fswitchlocs = 'reg:/include/src/,reg:|include/.*|src|,reg:|include/.*||,../src'
- au BufEnter *.h let b:fswitchdst = 'cpp'
+ "au BufEnter *.cpp let b:fswitchlocs = 'reg:/src/include/,reg:|src|include/**|,../include'
+ "au BufEnter *.h let b:fswitchlocs = 'reg:/include/src/,reg:|include/.*|src|,reg:|include/.*||,../src'
+ "au BufEnter *.h let b:fswitchdst = 'cpp'
augroup END
View
@@ -22,3 +22,4 @@
* **Signs**: `git clone https://github.com/MarcWeber/vim-addon-signs.git vim-signs`
* **MWUtils**: `git clone https://github.com/MarcWeber/vim-addon-mw-utils.git vim-mwutils`
* **Completion**: `git clone https://github.com/MarcWeber/vim-addon-completion.git vim-completion`
+* **OrgMode**: `git clone https://github.com/jceb/vim-orgmode.git vim-orgmode`
View
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cat from_github.md | grep 'git clone' | sed 's/.*`\(.*\)`.*$/\1/' | while read f
+do
+ d=$(echo $f | cut -f4 -d' ')
+ if [[ ! -d "$d" ]]; then
+ eval $f
+ fi
+done
View
2 vimrc
@@ -288,7 +288,7 @@ set nocursorline
set nocursorcolumn
if has("mac")
- let g:main_font = "Menlo\\ Regular:h11"
+ let g:main_font = "Menlo\\ Regular:h13"
let g:small_font = "Menlo\\ Regular:h2"
else
let g:main_font = "Monospace\\ 9"

0 comments on commit a5af27f

Please sign in to comment.