Merge pull request spf13#429 from sbennett18/3.0

Add various useful commands

Author: spf13

.vimrc

@@ -140,7 +140,7 @@
 
     highlight clear SignColumn      " SignColumn should match background for
                                     " things like vim-gitgutter
-                                    
+
     highlight clear LineNr          " Current line number row will have same background color in relative mode.
                                     " Things like vim-gitgutter will match LineNr highlight
     "highlight clear CursorLineNr   " Remove highlight color from current line number
@@ -162,8 +162,6 @@
         set statusline+=\ [%{&ff}/%Y]            " Filetype
         set statusline+=\ [%{getcwd()}]          " Current dir
         set statusline+=%=%-14.(%l,%c%V%)\ %p%%  " Right aligned file nav info
-
-        let g:airline_theme='powerlineish'       " airline users use the powerline theme
     endif
 
     set backspace=indent,eol,start  " Backspace for dummies
@@ -194,6 +192,9 @@
     set expandtab                   " Tabs are spaces, not tabs
     set tabstop=4                   " An indentation every four columns
     set softtabstop=4               " Let backspace delete indent
+    set nojoinspaces                " Prevents inserting two spaces after punctuation on a join (J)
+    set splitright                  " Puts new vsplit windows to the right of the current
+    set splitbelow                  " Puts new split windows to the bottom of the current
     "set matchpairs+=<:>             " Match, to be used with %
     set pastetoggle=<F12>           " pastetoggle (sane indentation on pastes)
     "set comments=sl:/*,mb:*,elx:*/  " auto format comment blocks
@@ -202,7 +203,7 @@
     autocmd FileType go autocmd BufWritePre <buffer> Fmt
     autocmd BufNewFile,BufRead *.html.twig set filetype=html.twig
     autocmd FileType haskell setlocal expandtab shiftwidth=2 softtabstop=2
-    " preceding line best in a plugin but here for now. 
+    " preceding line best in a plugin but here for now.
 
     autocmd BufNewFile,BufRead *.coffee set filetype=coffee
 
@@ -286,6 +287,9 @@
     " Toggle search highlighting
     nmap <silent> <leader>/ :set invhlsearch<CR>
 
+    " Find merge conflict markers
+    map <leader>fc /\v^[<\|=>]{7}( .*\|$)<CR>
+
     " Shortcuts
     " Change Working Directory to that of the current file
     cmap cwd lcd %:p:h
@@ -295,6 +299,10 @@
     vnoremap < <gv
     vnoremap > >gv
 
+    " Allow using the repeat operator with a visual selection (!)
+    " http://stackoverflow.com/a/8064607/127816
+    vnoremap . :normal .<CR>
+
     " Fix home and end keybindings for screen, particularly on mac
     " - for some reason this fixes the arrow keys too. huh.
     map  $
@@ -365,6 +373,12 @@
 
     " Ctags {
         set tags=./tags;/,~/.vimtags
+
+        " Make tags placed in .git/tags file available in all levels of a repository
+        let gitroot = substitute(system('git rev-parse --show-toplevel'), '[\n\r]', '', 'g')
+        if gitroot != ''
+            let &tags = &tags . ',' . gitroot . '/.git/tags'
+        endif
     " }
 
     " AutoCloseTag {
@@ -590,6 +604,7 @@
             set completeopt-=preview
         endif
     " }
+
     " neocomplcache {
         if count(g:spf13_bundle_groups, 'neocomplcache')
             let g:acp_enableAtStartup = 0
@@ -712,6 +727,12 @@
         let g:indent_guides_enable_on_vim_startup = 1
     " }
 
+    " airline {
+        let g:airline_theme='powerlineish'      " airline users use the powerline theme
+        let g:airline_left_sep='›'              " Slightly fancier separator, instead of '>'
+        let g:airline_right_sep='‹'             " Slightly fancier separator, instead of '<'
+    " }
+
 " }
 
 " GUI Settings {
@@ -826,6 +847,29 @@
     endfunction
     " }
 
+    " Shell command {
+    function! s:RunShellCommand(cmdline)
+        botright new
+
+        setlocal buftype=nofile
+        setlocal bufhidden=delete
+        setlocal nobuflisted
+        setlocal noswapfile
+        setlocal nowrap
+        setlocal filetype=shell
+        setlocal syntax=shell
+
+        call setline(1, a:cmdline)
+        call setline(2, substitute(a:cmdline, '.', '=', 'g'))
+        execute 'silent $read !' . escape(a:cmdline, '%#')
+        setlocal nomodifiable
+        1
+    endfunction
+
+    command! -complete=file -nargs=+ Shell call s:RunShellCommand(<q-args>)
+    " e.g. Grep current file for <search_term>: Shell grep -Hn <search_term> %
+    " }
+
 " }
 
 " Use fork vimrc if available {

.vimrc.bundles

@@ -1,5 +1,5 @@
 " Modeline and Notes {
-" vim: set foldmarker={,} foldlevel=0 foldmethod=marker spell:
+" vim: set sw=4 ts=4 sts=4 et tw=78 foldmarker={,} foldlevel=0 foldmethod=marker spell:
 "
 "                    __ _ _____              _
 "         ___ _ __  / _/ |___ /      __   __(_)_ __ ___
@@ -16,8 +16,9 @@
 " }
 
 " Environment {
+
     " Basics {
-        set nocompatible        " must be first line
+        set nocompatible        " Must be first line
         set background=dark     " Assume a dark background
     " }
 
@@ -44,9 +45,9 @@
           endif
         endif
     " }
-    "
+
     " Setup Bundle Support {
-    " The next three lines ensure that the ~/.vim/bundle/ system works
+        " The next three lines ensure that the ~/.vim/bundle/ system works
         filetype off
         set rtp+=~/.vim/bundle/vundle
         call vundle#rc()
@@ -55,6 +56,7 @@
 " }
 
 " Bundles {
+
     " Deps
         Bundle 'gmarik/vundle'
         Bundle 'MarcWeber/vim-addon-mw-utils'
@@ -74,6 +76,7 @@
             source ~/.vimrc.bundles.local
         endif
     " }
+
     " Use fork bundles if available {
         if filereadable(expand("~/.vimrc.bundles.fork"))
             source ~/.vimrc.bundles.fork
@@ -151,7 +154,7 @@
             Bundle 'Shougo/neosnippet'
             Bundle 'honza/vim-snippets'
         elseif count(g:spf13_bundle_groups, 'neocomplete')
-			Bundle 'Shougo/neocomplete.vim.git'
+            Bundle 'Shougo/neocomplete.vim.git'
             Bundle 'Shougo/neosnippet'
             Bundle 'honza/vim-snippets'
         endif
@@ -229,16 +232,16 @@
             Bundle 'Puppet-Syntax-Highlighting'
         endif
 
-
     " Twig
         if count(g:spf13_bundle_groups, 'twig')
             Bundle 'beyondwords/vim-twig'
         endif
     endif
+
 " }
 
 " General {
     " set autowrite                  " automatically write a file when leaving a modified buffer
-    set shortmess+=filmnrxoOtT      " abbrev. of messages (avoids 'hit enter')
+    set shortmess+=filmnrxoOtT      " Abbrev. of messages (avoids 'hit enter')
 " }