Merge branch 'dev'

Author: aserebryakov

README.md

@@ -163,6 +163,11 @@ Changelog
 
 * Added items highlighting
 
+#### 0.5.1
+
+* Fixed the annoying noise when navigating over items in default mode
+* Fixed the cursor position after the item is toggled
+
 Credits
 -------
 

doc/vim-todo-lists.txt

@@ -1,4 +1,4 @@
-*vim-todo-lists.txt*    Version 0.4.0
+*vim-todo-lists.txt*    Version 0.5.1
 *vim-todo-lists*
 
 Plugin for TODO lists management.
@@ -196,6 +196,11 @@ SOFTWARE.
 
 * Added items highlighting
 
+0.5.1
+
+* Fixed the annoying noise when navigating over items in default mode
+* Fixed the cursor position after the item is toggled
+
 ==============================================================================
 8. Credits                                                 *VimTodoListsCredits*
 

plugin/vim-todo-lists.vim

@@ -217,36 +217,34 @@ function! VimTodoListsCreateNewItemAbove()
 endfunction
 
 
-" Creates e new item below the current line
+" Creates a new item below the current line
 function! VimTodoListsCreateNewItemBelow()
   normal! o  [ ] 
   startinsert!
 endfunction
 
 
-" Creates e new item in the current line
+" Creates a new item in the current line
 function! VimTodoListsCreateNewItem()
   normal! 0i  [ ] 
   startinsert!
 endfunction
 
 
-" Moves te cursor to the next item
+" Moves the cursor to the next item
 function! VimTodoListsGoToNextItem()
   normal! $
   silent! exec '/^\s*\[.\]'
   silent! exec 'noh'
-  normal! f[
   normal! l
 endfunction
 
 
-" Moves te cursor to the previous item
+" Moves the cursor to the previous item
 function! VimTodoListsGoToPreviousItem()
   normal! 0
   silent! exec '?^\s*\[.\]'
   silent! exec 'noh'
-  normal! f[
   normal! l
 endfunction
 
@@ -255,12 +253,19 @@ endfunction
 function! VimTodoListsToggleItem()
   let l:line = getline('.')
 
+  " Store current cursor position
+  let l:cursor_pos = getcurpos()
+
   if VimTodoListsItemIsNotDone(l:line) == 1
     call VimTodoListsForEachChild(line('.'), 'VimTodoListsSetItemDone')
   elseif VimTodoListsItemIsDone(l:line) == 1
     call VimTodoListsForEachChild(line('.'), 'VimTodoListsSetItemNotDone')
   endif
 
+  " Restore the current position
+  " Using the {curswant} value to set the proper column
+  call cursor(l:cursor_pos[1], l:cursor_pos[4])
+
   call VimTodoListsUpdateParent(line('.'))
 endfunction