Update gvimrc

diff --git a/.vim/gvimrc b/.vim/gvimrc
index 2e6ce79e890047bdc7bed9c942f006aad78a05c2..49e9160d5cb96a5f8b10e95b8a0b4537b9366db7 100644 (file)
--- a/.vim/gvimrc
+++ b/.vim/gvimrc
@@ -1,16 +1,40 @@
+
+" Use :help 'option' to see the documentation for the given option.
+
+" mouse
+set mousehide
+set mouse=a
+set mousemodel=popup
+
+" mapping
+map <S-Insert> <MiddleMouse>
+map! <S-Insert> <MiddleMouse>
+
+" gui
+set guioptions+=a
+set guioptions-=m "no menu bar
+set guioptions-=T "no toolbar
+set guioptions-=r "no scroolbar
+set noguipty
+
+" colors
 highlight normal guibg=black guifg=white
 highlight linenr guifg=grey
-set guioptions+=a
-set guioptions-=m "menu bar
-  set guioptions-=T "toolbar      set guioptions-=r "scroolbar
-  set encoding=utf-8
-if exists("&guifont")
-  if has("mac")
-    set guifont=monaco:h11
-  elseif has("unix")
-    set guifont=inconsolata\ 11
-  elseif has("win32")
-"    set guifont=consolas:h11,courier\ new:h10
-    set guifont=consolas:h10:cANSI:qDRAFT
-  endif
+
+" fonts
+if has("mac")
+  set guifont=monaco:h11
+elseif has("unix")
+"  set guifont=-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1
+  set guifont=inconsolata\ 11
+elseif has("win32")
+"  set guifont=consolas:h11,courier\ new:h10
+  set guifont=consolas:h10:cANSI:qDRAFT
+endif
+
+" help
+if has("win32")
+  let winhelpfile='windows.hlp'
+  map K :execute "!start winhlp32 -k <cword> " . winhelpfile <CR>
 endif
+

diff --git a/.vim/vimrc b/.vim/vimrc
index 2c88dbf0140bc8c1c693aeddcaaeb8172ff47e15..875ce5f96cf0378eb296e73fbb2b9dffb627e36c 100644 (file)
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -41,15 +41,13 @@ set foldopen+=jump,search
 set foldlevel=1
 set foldclose=all
 
-" keyboard and mouse
+" keyboard
+let mapleader = ","
 set backspace=indent,eol,start
 set ttimeoutlen=10
 set winaltkeys=no
-set mouse=a
-set mousemodel=popup
 set noerrorbells
 set visualbell
-let mapleader = ","
 set pastetoggle=<leader>p
 
 " command/status line
@@ -90,14 +88,18 @@ if has("win32")
 endif
 set fileformats=unix,dos,mac
 set fileignorecase
+set encoding=utf-8
 
-" colors and fonts
+" colors
 set t_Co=256
 set background=dark
-highlight LineNr ctermfg=grey
+highlight normal ctermbg=black ctermfg=white
+highlight linenr ctermfg=grey
+
+" fonts
 set list
 if has('multi_byte') && &encoding ==# 'utf-8'
-  let &listchars = 'tab:▸ ,extends:❯,precedes:❮,nbsp:±'
+  let &listchars = 'tab:âÂ\96¸ ,extends:âÂ\9d¯,precedes:âÂ\9d®,nbsp:Ã\82±'
 else
   let &listchars = 'tab:> ,extends:>,precedes:<,nbsp:.'
 endif
@@ -117,44 +119,43 @@ let g:netrw_liststyle=3
 let g:netrw_banner = 0
 let g:netrw_sort_sequence = '[\/]$,*'
 
-" Plugins
+" Packages
 
 " ALE
-packadd ale
+packadd! ale
 
 " Tagbar
-packadd tagbar
+packadd! tagbar
 nnoremap <Leader>t    :TagbarToggle<CR>
 
 " Fugitive
-packadd vim-fugitive
+packadd! vim-fugitive
 
 " Gtags
-packadd vim-gtags
+packadd! vim-gtags
 
 " Unimpaired
-packadd vim-unimpaired
+packadd! vim-unimpaired
 
 " Ranger
-packadd ranger.vim
-packadd bclose.vim
+packadd! ranger.vim
+packadd! bclose.vim
 let g:ranger_replace_netrw = 1
-nnoremap <silent><Leader>e   :Ranger<CR>
 
 " Airline
-packadd vim-airline
+packadd! vim-airline
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
 
 " Editorconfig
-packadd editorconfig-vim
+packadd! editorconfig-vim
 let g:editorconfig_exclude_patterns = ['fugitive://.*', 'scp://.*']
 let g:editorconfig_verbose = 1
 let g:editorconfig_core_mode = "python_builtin"
 
 
 " CtrlP
-packadd ctrlp.vim
+packadd! ctrlp.vim
 let g:ctrlp_map = '<Leader>p'
 let g:ctrlp_cmd = 'CtrlP'
 let g:ctrlp_user_command = ['.git/', 'git --git-dir=%s/.git ls-files -oc --exclude-standard']
@@ -164,7 +165,13 @@ nnoremap <Leader>b   :CtrlPBuffer<CR>
 nnoremap <Leader>m   :CtrlPMRU<CR>
 
 " matchit
-packadd matchit
+packadd! matchit
+
+" termdebug
+packadd! termdebug
+
+" shellmenu
+packadd! shellmenu
 
 " Normal mode Mappings
 nnoremap ;                  :
@@ -195,7 +202,8 @@ tnoremap <C-l>              <C-\><C-n><C-w>l
 
 " Autocommands
 if has('autocmd')
-  augroup filetype
+  " Put these in an autocmd groups, so that we can delete them easily.
+  augroup filetypes
     au!
     au bufnewfile,buffilepre,bufread *.md     set filetype=markdown
     au bufnewfile,buffilepre,bufread *.gradle set filetype=groovy
@@ -208,7 +216,7 @@ if has('autocmd')
     au focuslost * wall
   augroup END
 
-  augroup numbertoggle
+  augroup numbers
     au!
     au bufenter,focusgained,insertleave * set relativenumber
     au bufleave,focuslost,insertenter   * set norelativenumber