addiitions

1 files changed, 58 insertions, 60 deletions

diff --git a/Editor/vimrc b/Editor/vimrc
index 2dee78d..6cfe291 100644
--- a/Editor/vimrc
+++ b/Editor/vimrc
@@ -1,38 +1,38 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
-set rtp+=~/.vim/bundle/Vundle.vim
-call vundle#begin()
-
-Plugin 'scrooloose/syntastic'
-
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
-
-Plugin 'tpope/vim-surround'
+"set rtp+=~/.vim/bundle/Vundle.vim
+"call vundle#begin()
+"
+"Plugin 'scrooloose/syntastic'
+"
+"Plugin 'SirVer/ultisnips'
+"Plugin 'honza/vim-snippets'
+"
+"Plugin 'tpope/vim-surround'
 
 
 
-call vundle#end()            " required
+"call vundle#end()            " required
 filetype plugin indent on    " required
 
-"Syntatic settings
-let g:syntastic_enable_perl_checker = 1
-let g:syntastic_perl_checkers = ['perl']
-set statusline+=%#warningmsg#
-set statusline+=%{SyntasticStatuslineFlag()}
-set statusline+=%*
-
-let g:syntastic_always_populate_loc_list = 1
-let g:syntastic_auto_loc_list = 1
-let g:syntastic_check_on_open = 1
-let g:syntastic_check_on_wq = 0
-
-
-" Ultisnips
-let g:UltiSnipsExpandTrigger="<leader>c"
-let g:UltiSnipsJumpForwardTrigger="<c-b>"
-let g:UltiSnipsJumpBackwardTrigger="<c-z>"
+""Syntatic settings
+"let g:syntastic_enable_perl_checker = 1
+"let g:syntastic_perl_checkers = ['perl']
+"set statusline+=%#warningmsg#
+"set statusline+=%{SyntasticStatuslineFlag()}
+"set statusline+=%*
+"
+"let g:syntastic_always_populate_loc_list = 1
+"let g:syntastic_auto_loc_list = 1
+"let g:syntastic_check_on_open = 1
+"let g:syntastic_check_on_wq = 0
+"
+"
+"" Ultisnips
+"let g:UltiSnipsExpandTrigger="<leader>c"
+"let g:UltiSnipsJumpForwardTrigger="<c-b>"
+"let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 
 
 "General
@@ -96,7 +96,7 @@ set isfname+=32
 "Set tab to two spaces
 set expandtab
 set shiftwidth=2
-set softtabstop=2
+"set softtabstop=2
 
 
 "Make tab into another escape
@@ -121,39 +121,37 @@ set mouse=
 nnoremap <Leader>o :CtrlP<CR>
 nnoremap <Leader>w :w<CR>
 
-
 "
 " YouCompleteMe options
 "
 
-let g:ycm_register_as_syntastic_checker = 1 "default 1
-let g:Show_diagnostics_ui = 1 "default 1
-
-"will put icons in Vim's gutter on lines that have a diagnostic set.
-"Turning this off will also turn off the YcmErrorLine and YcmWarningLine
-"highlighting
-let g:ycm_enable_diagnostic_signs = 1
-let g:ycm_enable_diagnostic_highlighting = 0
-let g:ycm_always_populate_location_list = 1 "default 0
-let g:ycm_open_loclist_on_ycm_diags = 1 "default 1
-
-
-let g:ycm_complete_in_strings = 1 "default 1
-let g:ycm_collect_identifiers_from_tags_files = 0 "default 0
-let g:ycm_path_to_python_interpreter = '' "default ''
-
-
-let g:ycm_server_use_vim_stdout = 0 "default 0 (logging to console)
-let g:ycm_server_log_level = 'info' "default info
-
-
-let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'  "where to search for .ycm_extra_conf.py if not found
-let g:ycm_confirm_extra_conf = 0
-
-
-let g:ycm_goto_buffer_command = 'same-buffer' "[ 'same-buffer', 'horizontal-split', 'vertical-split', 'new-tab' ]
-let g:ycm_filetype_whitelist = { '*': 1 }
-let g:ycm_key_invoke_completion = '<C-Space>'
-
-
-nnoremap <leader>r :YcmForceCompileAndDiagnostics <CR>
+" let g:ycm_register_as_syntastic_checker = 1 "default 1
+" let g:Show_diagnostics_ui = 1 "default 1
+" 
+" "will put icons in Vim's gutter on lines that have a diagnostic set.
+" "Turning this off will also turn off the YcmErrorLine and YcmWarningLine
+" "highlighting
+" let g:ycm_enable_diagnostic_signs = 1
+" let g:ycm_enable_diagnostic_highlighting = 0
+" let g:ycm_always_populate_location_list = 1 "default 0
+" let g:ycm_open_loclist_on_ycm_diags = 1 "default 1
+" 
+" 
+" let g:ycm_complete_in_strings = 1 "default 1
+" let g:ycm_collect_identifiers_from_tags_files = 0 "default 0
+" let g:ycm_path_to_python_interpreter = '' "default ''
+" 
+" 
+" let g:ycm_server_use_vim_stdout = 0 "default 0 (logging to console)
+" let g:ycm_server_log_level = 'info' "default info
+" 
+" 
+" let g:ycm_global_ycm_extra_conf = '~/.ycm_extra_conf.py'  "where to search for .ycm_extra_conf.py if not found
+" let g:ycm_confirm_extra_conf = 0
+" 
+" 
+" let g:ycm_goto_buffer_command = 'same-buffer' "[ 'same-buffer', 'horizontal-split', 'vertical-split', 'new-tab' ]
+" let g:ycm_filetype_whitelist = { '*': 1 }
+" let g:ycm_key_invoke_completion = '<C-Space>'
+" 
+"