From 9b5e4b445a102e3e05732e8a0f4f2dd32ab6c3dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20F=2E=20Sch=C3=B6nitzer?= <michael@schoenitzer.de>
Date: Wed, 4 Apr 2018 16:54:41 +0200
Subject: [PATCH] Revert previous changes

---
 autoload/vimwiki/html.vim |  6 +-----
 autoload/vimwiki/lst.vim  | 10 +++++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/autoload/vimwiki/html.vim b/autoload/vimwiki/html.vim
index 65c2315..11261c7 100644
--- a/autoload/vimwiki/html.vim
+++ b/autoload/vimwiki/html.vim
@@ -1457,11 +1457,7 @@ function! s:convert_file(path_html, wikifile) "{{{
     endif
 
     " prepare regexps for lists
-    if exists("g:vimwiki_additional_bullet_types")
-      let s:bullets = '[*-'. join(keys(g:vimwiki_additional_bullet_types), '') . ']'
-    else
-      let s:bullets = '[*-]'
-    endif
+    let s:bullets = '[*-]'
     let s:numbers =
       \'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'
 
diff --git a/autoload/vimwiki/lst.vim b/autoload/vimwiki/lst.vim
index 255ba72..390e542 100644
--- a/autoload/vimwiki/lst.vim
+++ b/autoload/vimwiki/lst.vim
@@ -1401,7 +1401,7 @@ endfunction "}}}
 function! s:cr_on_empty_list_item(lnum, behavior) "{{{
   if a:behavior == 1
     "just make a new list item
-    normal! gi
+    normal! gi

     call s:clone_marker_from_to(a:lnum, a:lnum+1)
     startinsert!
     return
@@ -1428,7 +1428,7 @@ function! s:cr_on_empty_list_item(lnum, behavior) "{{{
     let neighbor_item = s:get_a_neighbor_item(item)
     let child_item = s:get_first_child(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(child_item, 0, 0)
     call s:update_state(parent_item)
@@ -1457,7 +1457,7 @@ endfunction "}}}
 function! s:cr_on_empty_line(lnum, behavior) "{{{
   "inserting and deleting the x is necessary
   "because otherwise the indent is lost
-  normal! gix
+  normal! gi
x
   if a:behavior == 2 || a:behavior == 3
     call s:create_marker(a:lnum+1)
   endif
@@ -1466,7 +1466,7 @@ endfunction "}}}
 function! s:cr_on_list_item(lnum, insert_new_marker, not_at_eol) "{{{
   if a:insert_new_marker
     "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)
     "tiny sweet extra feature: indent next line if current line ends with :
     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
     " || (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
+    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