y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix weird behavior when pressing CR and Spaces follow

Browse Source 
That's because Vim silently deletes the trailing whitespaces when
pressing enter
This commit is contained in:
EinfachToll 2013-07-29 10:42:13 +02:00
parent 6317912520
commit c3ba10ca12
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
autoload/vimwiki/lst.vim
View File

@ -1221,14 +1221,8 @@ function! s:cr_on_empty_line(lnum, behavior) "{{{
endif endif
endfunction "}}} endfunction "}}}
function! s:cr_on_list_item(lnum, behavior, cur_col) "{{{ function! s:cr_on_list_item(lnum, insert_new_marker) "{{{
if a:behavior == 2 || a:behavior == 4 || (a:cur_col == 0 && getline(a:lnum) =~ '\s$') if a:insert_new_marker
" || (cur_item.lnum < s:get_last_line_of_item(cur_item))
normal! gi 
let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
call s:indent_multiline(prev_line, a:lnum+1)
elseif a:behavior == 1 || a:behavior == 3
"the ultimate feature of this script: make new marker on <CR> "the ultimate feature of this script: make new marker on <CR>
normal! gi  normal! gi 
call s:clone_marker_from_to(a:lnum, a:lnum+1) call s:clone_marker_from_to(a:lnum, a:lnum+1)
@ -1236,6 +1230,12 @@ function! s:cr_on_list_item(lnum, behavior, cur_col) "{{{
if getline(a:lnum) =~ ':$' if getline(a:lnum) =~ ':$'
call s:change_level(a:lnum+1, a:lnum+1, 'increase', 0) call s:change_level(a:lnum+1, a:lnum+1, 'increase', 0)
endif endif
else
" || (cur_item.lnum < s:get_last_line_of_item(cur_item))
"indent this line so that it becomes the continuation of the line above
normal! gi 
let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
call s:indent_multiline(prev_line, a:lnum+1)
endif endif
endfunction "}}} endfunction "}}}
@ -1254,14 +1254,22 @@ function! vimwiki#lst#kbd_cr(normal, just_mrkr) "{{{
return return
endif endif
let insert_new_marker = (a:normal == 1 || a:normal == 3)
if getline('.')[col("'^")-1:] =~ '^\s\+$'
let cur_col = 0
else
let cur_col = col("$") - col("'^") let cur_col = col("$") - col("'^")
if insert_new_marker && cur_col == 0 && getline(lnum) =~ '\s$'
let insert_new_marker = 0
endif
endif
if has_bp == 0 if has_bp == 0
call s:cr_on_empty_line(lnum, a:normal) call s:cr_on_empty_line(lnum, a:normal)
endif endif
if has_bp == 2 if has_bp == 2
call s:cr_on_list_item(lnum, a:normal, cur_col) call s:cr_on_list_item(lnum, insert_new_marker)
endif endif
call cursor(lnum+1, col("$") - cur_col) call cursor(lnum+1, col("$") - cur_col)