Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Showing with 37 additions and 31 deletions.
  1. +6 −0 .gitmodules
  2. +29 −29 .gvimrc
  3. +1 −1 .vimrc
  4. +0 −1 bundle/ctrlp
  5. +1 −0 bundle/vim-surround
View
6 .gitmodules
@@ -0,0 +1,6 @@
+[submodule "bundle/nerdtree"]
+ path = bundle/nerdtree
+ url = git://github.com/scrooloose/nerdtree.git
+[submodule "bundle/vim-surround"]
+ path = bundle/vim-surround
+ url = git://github.com/tpope/vim-surround.git
View
58 .gvimrc
@@ -1,36 +1,36 @@
-colo mustang
-set nu
-set showcmd
-set guifont=Droid\ Sans\ Mono\ 9
+"colo mustang
+"set nu
+"set showcmd
+set guifont=Cousine\ 9
set lines=36
set columns=100
-set ignorecase
-set smartcase
-set expandtab
-set shiftwidth=4
-set tabstop=4
-set smarttab
-set incsearch
-set hlsearch
+"set ignorecase
+"set smartcase
+"set expandtab
+"set shiftwidth=4
+"set tabstop=4
+"set smarttab
+"set incsearch
+"set hlsearch
+set go-=m
set go-=T
nmap <space> <PageDown>
nmap <S-space> <PageUp>
-autocmd FileType php set omnifunc=phpcomplete#CompletePHP
-autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
-autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
-autocmd FileType css set omnifunc=csscomplete#CompleteCSS
-if exists('loaded_taglist')
- nmap <silent> <F8> :TlistToggle<CR>
-endif
-
-set completeopt=longest,menuone
-imap <C-f> <C-x><C-o>
-inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>"
-inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<CR>"
-inoremap <expr> <Down> pumvisible() ? "\<C-n>" : "\<Down>"
-inoremap <expr> <Up> pumvisible() ? "\<C-p>" : "\<Up>"
-inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
-inoremap <expr> <PageUp> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>"
-
+"autocmd FileType php set omnifunc=phpcomplete#CompletePHP
+"autocmd FileType html set omnifunc=htmlcomplete#CompleteTags
+"autocmd FileType javascript set omnifunc=javascriptcomplete#CompleteJS
+"autocmd FileType css set omnifunc=csscomplete#CompleteCSS
+"if exists('loaded_taglist')
+" nmap <silent> <F8> :TlistToggle<CR>
+"endif
+"
+"set completeopt=longest,menuone
+"imap <C-f> <C-x><C-o>
+"inoremap <expr> <Esc> pumvisible() ? "\<C-e>" : "\<Esc>"
+"inoremap <expr> <CR> pumvisible() ? "\<C-y>" : "\<CR>"
+"inoremap <expr> <Down> pumvisible() ? "\<C-n>" : "\<Down>"
+"inoremap <expr> <Up> pumvisible() ? "\<C-p>" : "\<Up>"
+"inoremap <expr> <PageDown> pumvisible() ? "\<PageDown>\<C-p>\<C-n>" : "\<PageDown>"
+"inoremap <expr> <PageUp> pumvisible() ? "\<PageUp>\<C-p>\<C-n>" : "\<PageUp>"
View
2 .vimrc
@@ -47,7 +47,7 @@ vmap <S-Tab> <gv
nnoremap <silent> <leader><space> :let @/=''<CR>
"save on alt-tab
-au FocusLost * :wa
+"au FocusLost * :wa
au BufRead,BufNewFile *.phtml setl ts=2 sw=2 sts=2
au FileType python setl tabstop=2 shiftwidth=2 softtabstop=2
1 bundle/ctrlp
@@ -1 +0,0 @@
-Subproject commit 5dd5e526c0133a448344632e938c2449d0999a07
1 bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit efc017dcb4e0c95e195dd7c4fb903ecaa2a094e9

No commit comments for this range

Something went wrong with that request. Please try again.