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

Revert previous changes

Browse Source
This commit is contained in:
Michael F. Schönitzer 2018-04-04 16:54:41 +02:00
parent 5ad702cce6
commit 9b5e4b445a
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/vimwiki/html.vim
View File

@ -1457,11 +1457,7 @@ function! s:convert_file(path_html, wikifile) "{{{
endif endif
" prepare regexps for lists " prepare regexps for lists
if exists("g:vimwiki_additional_bullet_types") let s:bullets = '[*-]'
let s:bullets = '[*-'. join(keys(g:vimwiki_additional_bullet_types), '') . ']'
else
let s:bullets = '[*-]'
endif
let s:numbers = let s:numbers =
\'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)' \'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'

10
autoload/vimwiki/lst.vim
View File

@ -1401,7 +1401,7 @@ endfunction "}}}
function! s:cr_on_empty_list_item(lnum, behavior) "{{{ function! s:cr_on_empty_list_item(lnum, behavior) "{{{
if a:behavior == 1 if a:behavior == 1
"just make a new list item "just make a new list item
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)
startinsert! startinsert!
return return
@ -1428,7 +1428,7 @@ function! s:cr_on_empty_list_item(lnum, behavior) "{{{
let neighbor_item = s:get_a_neighbor_item(item) let neighbor_item = s:get_a_neighbor_item(item)
let child_item = s:get_first_child(item) let child_item = s:get_first_child(item)
let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item() let parent_item = (item.cb != '') ? s:get_parent(item) : s:empty_item()
normal! "_cc normal! "_cc
call s:adjust_numbered_list(neighbor_item, 0, 0) call s:adjust_numbered_list(neighbor_item, 0, 0)
call s:adjust_numbered_list(child_item, 0, 0) call s:adjust_numbered_list(child_item, 0, 0)
call s:update_state(parent_item) call s:update_state(parent_item)
@ -1457,7 +1457,7 @@ endfunction "}}}
function! s:cr_on_empty_line(lnum, behavior) "{{{ function! s:cr_on_empty_line(lnum, behavior) "{{{
"inserting and deleting the x is necessary "inserting and deleting the x is necessary
"because otherwise the indent is lost "because otherwise the indent is lost
normal! gix normal! gi x
if a:behavior == 2 || a:behavior == 3 if a:behavior == 2 || a:behavior == 3
call s:create_marker(a:lnum+1) call s:create_marker(a:lnum+1)
endif endif
@ -1466,7 +1466,7 @@ endfunction "}}}
function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{ function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
if a:insert_new_marker if a:insert_new_marker
"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)
"tiny sweet extra feature: indent next line if current line ends with : "tiny sweet extra feature: indent next line if current line ends with :
if !a:not_at_eol && getline(a:lnum) =~# ':$' if !a:not_at_eol && getline(a:lnum) =~# ':$'
@ -1475,7 +1475,7 @@ function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
else else
" || (cur_item.lnum < s:get_last_line_of_item(cur_item)) " || (cur_item.lnum < s:get_last_line_of_item(cur_item))
"indent this line so that it becomes the continuation of the line above "indent this line so that it becomes the continuation of the line above
normal! gi normal! gi 
let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1)) let prev_line = s:get_corresponding_item(s:get_prev_line(a:lnum+1))
call s:indent_multiline(prev_line, a:lnum+1) call s:indent_multiline(prev_line, a:lnum+1)
endif endif