summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjlinehan <jlinehan@prodtest.exo.pathwaysystems.com>2014-05-15 13:25:21 +0000
committerjlinehan <jlinehan@prodtest.exo.pathwaysystems.com>2014-05-15 13:25:21 +0000
commit82b3ac63ee54e65b5a43475e1870e63339def498 (patch)
treebba4077da6063b879fd3ff962decad6bccd9926a
parent64e1d1a00484fd1dfb6a172b600535f81053c1c5 (diff)
Restores default.vimrc
Some lines had been commented out by mistake when making Ryan's
-rw-r--r--default.vimrc516
1 files changed, 258 insertions, 258 deletions
diff --git a/default.vimrc b/default.vimrc
index bb09f61..35564a5 100644
--- a/default.vimrc
+++ b/default.vimrc
@@ -14,15 +14,15 @@
" =============================================================================
" General
" `````````````````````````````````````````````````````````````````````````````
-" let mapleader="," " Set the <Leader> key
+ let mapleader="," " Set the <Leader> key
" Display
" `````````````````````````````````````````````````````````````````````````````
-" set showcmd " Show (partial) command in status line.
-" set number " Show line numbers.
-" set ruler " Show the current line and column
-" set fillchars=fold:\ " Set fold fill characters (default is '-')
-" set laststatus=2 " Show statusline even with one open buffer
+ set showcmd " Show (partial) command in status line.
+ set number " Show line numbers.
+ set ruler " Show the current line and column
+ set fillchars=fold:\ " Set fold fill characters (default is '-')
+ set laststatus=2 " Show statusline even with one open buffer
" Colors
" `````````````````````````````````````````````````````````````````````````````
@@ -32,259 +32,259 @@
" Saving
" `````````````````````````````````````````````````````````````````````````````
-" set autowriteall " Auto-write a modified file (autosave)
-" set hidden " Enable hiding existing buffers
-"
+ set autowriteall " Auto-write a modified file (autosave)
+ set hidden " Enable hiding existing buffers
+
" Tabs
" `````````````````````````````````````````````````````````````````````````````
-" set tabstop=8 " Set width of hard tab
-" set softtabstop=8 " Set number of spaces in soft tab
-" set shiftwidth=8 " Set number of spaces to auto-indent
-" set expandtab " Always insert soft tabs (spaces)
-"
-"" Automatic formatting
-"" `````````````````````````````````````````````````````````````````````````````
-" set cindent " Indent lines with C style indentation
-" set backspace=2 " Make backspace key behave itself
-" set formatoptions=c,q,r,t " c - Auto-wrap comments using textwidth
-" " q - Allow formatting of comments with 'gq'
-" " r - Automatically insert comment leader
-" " t - Auto-wrap text using textwidth
-" autocmd FileType make setlocal noexpandtab " Hard tabs in a Makefile
-"" filetype plugin indent on " enable filetype plugins and indentation
-"" set foldmethod=indent
-"
-"" Pattern matching
-"" `````````````````````````````````````````````````````````````````````````````
-" set hlsearch " Highlight all matches
-" set incsearch " Show matches immediately.
-" set ignorecase " Ignore case in search patterns.
-" set smartcase " Override 'ignorecase' pattern is ALLCAPS
-"
-"" Bracket matching
-"" `````````````````````````````````````````````````````````````````````````````
-" set showmatch " Jump to matching bracket
-" set matchtime=3 " Duration of matching bracket highlight
-"
-"" Folding
-"" `````````````````````````````````````````````````````````````````````````````
-"" set foldmethod=indent " Fold on indentations
-"
-"" Text wrap and line break
-"" `````````````````````````````````````````````````````````````````````````````
-"" set tw=80 " Text width is 80 characters
-" " To adjust a visual selection : gq
-" " To adjust the entire document: gqG
-"
-"" Temporary files (.swp)
-"" `````````````````````````````````````````````````````````````````````````````
-"" Automatically create .backup directory, writable by the group.
-" if filewritable(".") && ! filewritable(".backup")
-" silent execute '!umask 002; mkdir .backup'
-" endif
-"
-" set backupdir=./.backup,.,/tmp " Put swap files in .backup or /tmp
-" set directory=.,./.backup,/tmp " Put swap files in .backup or /tmp
-"
-"" =============================================================================
-"
-"
-"
-"" KEYBINDINGS
-"" =============================================================================
-"" Cursor movement
-"" `````````````````````````````````````````````````````````````````````````````
-" noremap <S-j> <C-D>
-" noremap <S-k> <C-U>
-" noremap <S-h> 5j
-" noremap <S-l> 5k
-"
-"" NERDTree
-"" `````````````````````````````````````````````````````````````````````````````
-" noremap <Leader>n :NERDTreeToggle<CR>
-"
-"" Buffers/buftabs
-"" `````````````````````````````````````````````````````````````````````````````
-" noremap <f1> :bprev<CR>
-" noremap <f2> :bnext<CR>
-"
-"" Make
-"" `````````````````````````````````````````````````````````````````````````````
-" noremap <f4> :cn<CR>
-" noremap <f3> :cp<CR>
-"
-"" Vimscripts and custom functions
-"" `````````````````````````````````````````````````````````````````````````````
-"" Keep pasted buffer from being auto-indented and print mode value.
-" noremap <F6> :set invpaste paste?<CR>
-" set pastetoggle=<F6>
-" set showmode
-"" Execute python file being edited
-" noremap <buffer> <S-e> :w<CR>:!/usr/bin/env python2 % <CR>
-"
-"" Colorcolumn stuff
-" noremap <Leader>8 <Esc>:call <SID>ToggleColorColumn()<CR>
-" noremap <Leader>7 <Esc>:call <SID>ToggleFormatColumn()<CR>
-"
-"" Close a buffer
-" noremap <Leader>1 <Esc>:call CleanClose(1)<CR>
-"" Cycle between 4- and 8-space tabs
-" noremap <Leader>p <Esc>:call CycleTabStop()<CR>
-" noremap <Leader>s :Gstatus<CR>
-" noremap <Leader>c :Gcommit<CR>
-"
-"" =============================================================================
-"
-"
-"
-"" PLUGINS
-"" =============================================================================
-"" Pathogen
-"" `````````````````````````````````````````````````````````````````````````````
+ set tabstop=8 " Set width of hard tab
+ set softtabstop=8 " Set number of spaces in soft tab
+ set shiftwidth=8 " Set number of spaces to auto-indent
+ set expandtab " Always insert soft tabs (spaces)
+
+" Automatic formatting
+" `````````````````````````````````````````````````````````````````````````````
+ set cindent " Indent lines with C style indentation
+ set backspace=2 " Make backspace key behave itself
+ set formatoptions=c,q,r,t " c - Auto-wrap comments using textwidth
+ " q - Allow formatting of comments with 'gq'
+ " r - Automatically insert comment leader
+ " t - Auto-wrap text using textwidth
+ autocmd FileType make setlocal noexpandtab " Hard tabs in a Makefile
+" filetype plugin indent on " enable filetype plugins and indentation
+ set foldmethod=indent
+
+" Pattern matching
+" `````````````````````````````````````````````````````````````````````````````
+ set hlsearch " Highlight all matches
+ set incsearch " Show matches immediately.
+ set ignorecase " Ignore case in search patterns.
+ set smartcase " Override 'ignorecase' pattern is ALLCAPS
+
+" Bracket matching
+" `````````````````````````````````````````````````````````````````````````````
+ set showmatch " Jump to matching bracket
+ set matchtime=3 " Duration of matching bracket highlight
+
+" Folding
+" `````````````````````````````````````````````````````````````````````````````
+ set foldmethod=indent " Fold on indentations
+
+" Text wrap and line break
+" `````````````````````````````````````````````````````````````````````````````
+" set tw=80 " Text width is 80 characters
+ " To adjust a visual selection : gq
+ " To adjust the entire document: gqG
+
+" Temporary files (.swp)
+" `````````````````````````````````````````````````````````````````````````````
+" Automatically create .backup directory, writable by the group.
+ if filewritable(".") && ! filewritable(".backup")
+ silent execute '!umask 002; mkdir .backup'
+ endif
+
+ set backupdir=./.backup,.,/tmp " Put swap files in .backup or /tmp
+ set directory=.,./.backup,/tmp " Put swap files in .backup or /tmp
+
+" =============================================================================
+
+
+
+" KEYBINDINGS
+" =============================================================================
+" Cursor movement
+" `````````````````````````````````````````````````````````````````````````````
+ noremap <S-j> <C-D>
+ noremap <S-k> <C-U>
+ noremap <S-h> 5j
+ noremap <S-l> 5k
+
+" NERDTree
+" `````````````````````````````````````````````````````````````````````````````
+ noremap <Leader>n :NERDTreeToggle<CR>
+
+" Buffers/buftabs
+" `````````````````````````````````````````````````````````````````````````````
+ noremap <f1> :bprev<CR>
+ noremap <f2> :bnext<CR>
+
+" Make
+" `````````````````````````````````````````````````````````````````````````````
+ noremap <f4> :cn<CR>
+ noremap <f3> :cp<CR>
+
+" Vimscripts and custom functions
+" `````````````````````````````````````````````````````````````````````````````
+" Keep pasted buffer from being auto-indented and print mode value.
+ noremap <F6> :set invpaste paste?<CR>
+ set pastetoggle=<F6>
+ set showmode
+" Execute python file being edited
+ noremap <buffer> <S-e> :w<CR>:!/usr/bin/env python2 % <CR>
+
+" Colorcolumn stuff
+ noremap <Leader>8 <Esc>:call <SID>ToggleColorColumn()<CR>
+ noremap <Leader>7 <Esc>:call <SID>ToggleFormatColumn()<CR>
+
+" Close a buffer
+ noremap <Leader>1 <Esc>:call CleanClose(1)<CR>
+" Cycle between 4- and 8-space tabs
+ noremap <Leader>p <Esc>:call CycleTabStop()<CR>
+ noremap <Leader>s :Gstatus<CR>
+ noremap <Leader>c :Gcommit<CR>
+
+" =============================================================================
+
+
+
+" PLUGINS
+" =============================================================================
+" Pathogen
+" `````````````````````````````````````````````````````````````````````````````
call pathogen#infect() " Add ~/.vim/bundle to the 'runtimepath'
-"
-"" NERDTree
-"" `````````````````````````````````````````````````````````````````````````````
-" let NERDTreeMinimalUI=1 " Disable the goofy '? for help' message
-" let NERDChristmasTree=1 " Tells the NERD tree to make itself colourful
-" let NERDTreeWinSize=31 " Default is 31
-"
-"" buftabs
-"" `````````````````````````````````````````````````````````````````````````````
-" let g:buftabs_only_basename=1 " Only print the filename (no parent dirs)
-" let g:buftabs_marker_start="" " Disable beginning and ending marks
-" let g:buftabs_marker_end="" " Instead, we use colors to show focus
-" let g:buftabs_in_statusline=1 " Display buftabs in statusline
-" let g:buftabs_active_highlight_group="StatusLineNC" " active buffer color
-" let g:buftabs_inactive_highlight_group="VisualNOS" " inactive buffer color
-"
-"
-"" dragvisuals
-"" `````````````````````````````````````````````````````````````````````````````
-" vmap <expr> <LEFT> DVB_Drag('left')
-" vmap <expr> <RIGHT> DVB_Drag('right')
-" vmap <expr> <DOWN> DVB_Drag('down')
-" vmap <expr> <UP> DVB_Drag('up')
-" vmap <expr> D DVB_Duplicate()
-" let g:DVB_TrimWS=1 " Remove any introduced trailing ws after moving
-"" =============================================================================
-"
-"
-"" ABBREVIATIONS
-"" =============================================================================
-"" Section flowerbox (80 column)
-"" `````````````````````````````````````````````````````````````````````````````
-" iab __FULL
-"\<CR>/******************************************************************************
-"\<CR><Left> SECTION
-"\<CR><Left>*****************************************************************************/
-"
-"" Subsection flowerbox (50 column)
-"" `````````````````````````````````````````````````````````````````````````````
-" iab __HALF
-"\<CR>/*************************************************
-"\<CR><Left> SUBSECTION
-"\<CR><Left>************************************************/
-"" =============================================================================
-"
-"
-"" VIMSCRIPTS
-"" =============================================================================
-"" CycleTabStop()
-"" `````````````````````````````````````````````````````````````````````````````
-" function! CycleTabStop()
-" if (&tabstop == 8)
-" set tabstop=4 softtabstop=4 shiftwidth=4 expandtab
-" echo '4-space tabs'
-" else
-" set tabstop=8 softtabstop=8 shiftwidth=8 expandtab
-" echo '8-space tabs'
-" endif
-" endfunction
-"
-"" ToggleColorColumn()
-"" `````````````````````````````````````````````````````````````````````````````
-" hi ColorColumn ctermbg=108
-" if exists('+colorcolumn')
-" set colorcolumn=81 " The column to be colored
-" endif
-"
-" let s:color_column_old=0 " ToggleColorColumn by default
-"
-" function! s:ToggleColorColumn()
-" if s:color_column_old == 0
-" let s:color_column_old = &colorcolumn
-" windo let &colorcolumn = 0
-" else
-" windo let &colorcolumn=s:color_column_old
-" let s:color_column_old = 0
-" endif
-" endfunction
-"
-"
-"" CleanClose() -- close a buffer and update buftabs without disturbing windows
-"" `````````````````````````````````````````````````````````````````````````````
-" function! CleanClose(tosave)
-" if (a:tosave == 1)
-" w!
-" endif
-" let todelbufNr = bufnr("%")
-" let newbufNr = bufnr("#")
-" if ((newbufNr != -1) && (newbufNr != todelbufNr) && buflisted(newbufNr))
-" exe 'b'.newbufNr
-" else
-" bnext
-" endif
-"
-" if (bufnr("%") == todelbufNr)
-" new
-" endif
-" exe 'bd'.todelbufNr
-" call Buftabs_show(todelbufNr)
-" endfunction
-"
-"" Each() -- Run a command on each item in the quickfix buffer.
-"" ````````````````````````````````````````````````````````````
-"function! Each(command)
-" " Create a dictionary so that we can get the list of
-" " buffers rather than the list of lines in buffers
-" " (easy way to get unique entries).
-" let buffer_numbers = {}
-" " For each entry, use the buffer number as a dictionary
-" " key (won't get repeats).
-" for fixlist_entry in getqflist()
-" let buffer_numbers[fixlist_entry['bufnr']] = 1
-" endfor
-" " Make it into a list as it seems cleaner
-" let buffer_number_list = keys(buffer_numbers)
-"
-" " For each buffer
-" for num in buffer_number_list
-" " Select the buffer
-" exe 'buffer' num
-" " Run the command that's passed as an argument
-" exe a:command
-" " Save if necessary
-" update
-" endfor
-"endfunction
-"
-"" Define a command to make it easier to use
-"command! -nargs=+ Each call Each(<q-args>)
-"
-"""
-"" R()
-"" `````
-"" Replace the word under the cursor with another string
-"" @replace_with: Word to replace <cword>
-"function! R(replace_with)
-" execute ':%s/' . expand("<cword>") . '/' . a:replace_with . '/gc'
-"endfunction
-"
-"" Define a command to make it easier to use
-"command! -nargs=+ R call R(<q-args>)
-"
-"
-"" =============================================================================
-"
+
+" NERDTree
+" `````````````````````````````````````````````````````````````````````````````
+ let NERDTreeMinimalUI=1 " Disable the goofy '? for help' message
+ let NERDChristmasTree=1 " Tells the NERD tree to make itself colourful
+ let NERDTreeWinSize=31 " Default is 31
+
+" buftabs
+" `````````````````````````````````````````````````````````````````````````````
+ let g:buftabs_only_basename=1 " Only print the filename (no parent dirs)
+ let g:buftabs_marker_start="" " Disable beginning and ending marks
+ let g:buftabs_marker_end="" " Instead, we use colors to show focus
+ let g:buftabs_in_statusline=1 " Display buftabs in statusline
+ let g:buftabs_active_highlight_group="StatusLineNC" " active buffer color
+ let g:buftabs_inactive_highlight_group="VisualNOS" " inactive buffer color
+
+
+" dragvisuals
+" `````````````````````````````````````````````````````````````````````````````
+ vmap <expr> <LEFT> DVB_Drag('left')
+ vmap <expr> <RIGHT> DVB_Drag('right')
+ vmap <expr> <DOWN> DVB_Drag('down')
+ vmap <expr> <UP> DVB_Drag('up')
+ vmap <expr> D DVB_Duplicate()
+ let g:DVB_TrimWS=1 " Remove any introduced trailing ws after moving
+" =============================================================================
+
+
+" ABBREVIATIONS
+" =============================================================================
+" Section flowerbox (80 column)
+" `````````````````````````````````````````````````````````````````````````````
+ iab __FULL
+\<CR>/******************************************************************************
+\<CR><Left> SECTION
+\<CR><Left>*****************************************************************************/
+
+" Subsection flowerbox (50 column)
+" `````````````````````````````````````````````````````````````````````````````
+ iab __HALF
+\<CR>/*************************************************
+\<CR><Left> SUBSECTION
+\<CR><Left>************************************************/
+" =============================================================================
+
+
+" VIMSCRIPTS
+" =============================================================================
+" CycleTabStop()
+" `````````````````````````````````````````````````````````````````````````````
+ function! CycleTabStop()
+ if (&tabstop == 8)
+ set tabstop=4 softtabstop=4 shiftwidth=4 expandtab
+ echo "4-space tabs"
+ else
+ set tabstop=8 softtabstop=8 shiftwidth=8 expandtab
+ echo "8-space tabs"
+ endif
+ endfunction
+
+" ToggleColorColumn()
+" `````````````````````````````````````````````````````````````````````````````
+ hi ColorColumn ctermbg=108
+ if exists('+colorcolumn')
+ set colorcolumn=81 " The column to be colored
+ endif
+
+ let s:color_column_old=0 " ToggleColorColumn by default
+
+ function! s:ToggleColorColumn()
+ if s:color_column_old == 0
+ let s:color_column_old = &colorcolumn
+ windo let &colorcolumn = 0
+ else
+ windo let &colorcolumn=s:color_column_old
+ let s:color_column_old = 0
+ endif
+ endfunction
+
+
+" CleanClose() -- close a buffer and update buftabs without disturbing windows
+" `````````````````````````````````````````````````````````````````````````````
+ function! CleanClose(tosave)
+ if (a:tosave == 1)
+ w!
+ endif
+ let todelbufNr = bufnr("%")
+ let newbufNr = bufnr("#")
+ if ((newbufNr != -1) && (newbufNr != todelbufNr) && buflisted(newbufNr))
+ exe "b".newbufNr
+ else
+ bnext
+ endif
+
+ if (bufnr("%") == todelbufNr)
+ new
+ endif
+ exe "bd".todelbufNr
+ call Buftabs_show(todelbufNr)
+ endfunction
+
+" Each() -- Run a command on each item in the quickfix buffer.
+" ````````````````````````````````````````````````````````````
+function! Each(command)
+ " Create a dictionary so that we can get the list of
+ " buffers rather than the list of lines in buffers
+ " (easy way to get unique entries).
+ let buffer_numbers = {}
+ " For each entry, use the buffer number as a dictionary
+ " key (won't get repeats).
+ for fixlist_entry in getqflist()
+ let buffer_numbers[fixlist_entry['bufnr']] = 1
+ endfor
+ " Make it into a list as it seems cleaner
+ let buffer_number_list = keys(buffer_numbers)
+
+ " For each buffer
+ for num in buffer_number_list
+ " Select the buffer
+ exe 'buffer' num
+ " Run the command that's passed as an argument
+ exe a:command
+ " Save if necessary
+ update
+ endfor
+endfunction
+
+" Define a command to make it easier to use
+command! -nargs=+ Each call Each(<q-args>)
+
+""
+" R()
+" `````
+" Replace the word under the cursor with another string
+" @replace_with: Word to replace <cword>
+function! R(replace_with)
+ execute ":%s/" . expand("<cword>") . "/" . a:replace_with . "/gc"
+endfunction
+
+" Define a command to make it easier to use
+command! -nargs=+ R call R(<q-args>)
+
+
+" =============================================================================
+