aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Christian Pohle2017-08-10 17:23:41 +0200
committerMax Christian Pohle2017-08-10 17:23:41 +0200
commit34b34b35d90d346f29ae1503869e46b1c3d04b49 (patch)
treef468fbf3c3dc3f6398d928fb645617e53ac5273a
parent395f8d32166d598f2899cc388948d5d9a6824c9b (diff)
downloadvim-34b34b35d90d346f29ae1503869e46b1c3d04b49.tar.bz2
vim-34b34b35d90d346f29ae1503869e46b1c3d04b49.zip
Some quick fixes, especially concerning margin handling
-rw-r--r--vimrc-full7
1 files changed, 4 insertions, 3 deletions
diff --git a/vimrc-full b/vimrc-full
index 37d5ea8..1b9b1f5 100644
--- a/vimrc-full
+++ b/vimrc-full
@@ -45,7 +45,7 @@ set redrawtime=100 | " The time in milliseconds for redrawing the dis
45" set restorescreen | " restores the console after exiting vim 45" set restorescreen | " restores the console after exiting vim
46" set shada+=n~/.vim/shada | " shada file to use 46" set shada+=n~/.vim/shada | " shada file to use
47set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge 47set scrolljump=5 | " how many lines get scrolled into view when cursor reaches the screens edge
48set scrolloff=999 | " keeps cursor centered 48set scrolloff=3 | " keeps cursor centered
49set splitbelow | " open new windows below the current one (i find that more intuitive) 49set splitbelow | " open new windows below the current one (i find that more intuitive)
50set shiftround | " indent/unindent snaps to multiple of shiftwidths 50set shiftround | " indent/unindent snaps to multiple of shiftwidths
51set shortmess+=I | " don't give the intro message when starting Vim |:intro|. 51set shortmess+=I | " don't give the intro message when starting Vim |:intro|.
@@ -53,7 +53,7 @@ set showcmd | " essential: show keys of combined commands in t
53set signcolumn=yes | " auto=auto hide, yes=always, no=never show the column with error indicators 53set signcolumn=yes | " auto=auto hide, yes=always, no=never show the column with error indicators
54set showtabline=2 | " 0: never, 1: only if there are at least two tabs, 2:always 54set showtabline=2 | " 0: never, 1: only if there are at least two tabs, 2:always
55set winwidth=30 | " keep NERDTreeWindow at least this size 55set winwidth=30 | " keep NERDTreeWindow at least this size
56set winminwidth=30 | " (and all other windows, so TODO: watch out) 56set winminwidth=0 | " (and all other windows, so TODO: watch out)
57set tags+=../tags 57set tags+=../tags
58" set textwidth=100 | " line length (80 used to be default, but...) 58" set textwidth=100 | " line length (80 used to be default, but...)
59" set colorcolumn= | " not used, because we have a :match directive for textwidth 59" set colorcolumn= | " not used, because we have a :match directive for textwidth
@@ -509,6 +509,7 @@ if has("gui_running")
509 set guioptions-=r | " do not show right scrollbar 509 set guioptions-=r | " do not show right scrollbar
510 set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped) 510 set winaltkeys=menu | " behave like other windows: ALT-key can be used to open the menu (and cannot be :remaped)
511 set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 10 511 set guifont=Dejavu\ Sans\ Mono\ for\ Powerline\ 10
512 set guifont=Source\ Code\ Pro\ Semi-Bold\ 10
512 " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12 513 " set guifont=Droid\ Sans\ Mono\ for\ Powerline\ 12
513" set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END 514" set selectmode=mouse,key,cmd | " enters vim's select mode when pressing shift-left or shift-END
514" set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text 515" set keymodel=startsel,stopsel | " makes shift-left, shift-right available for selecting text
@@ -748,7 +749,7 @@ let g:netrw_preview = 0 | "
748let g:netrw_winsize = 20 | " window size in percent 749let g:netrw_winsize = 20 | " window size in percent
749 750
750 751
751highlight WordBold cterm=bold gui=bold 752highlight WordBold ctermbg=LightYellow ctermfg=black cterm=bold gui=bold
752let w:m1 = 0 753let w:m1 = 0
753function! HighlightWordUnderCursor() 754function! HighlightWordUnderCursor()
754 if(exists('w:m1') && w:m1 > 0) 755 if(exists('w:m1') && w:m1 > 0)
..