From 45a5a1a82fa3d8bb0c339a283a6175b05d24c496 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 28 Jun 2018 14:39:29 +1200
Subject: Revert "Remove useless cursor restoration code"

This reverts commit 4c7a6b1e5640e8979dda8dd0553a232745501bad.

:join keeps the cursor on the same line, but moves to the first
non-blank column. I didn't notice this at first.
---
 plugin/fixed_join.vim | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/plugin/fixed_join.vim b/plugin/fixed_join.vim
index 1610011..2abb3a0 100644
--- a/plugin/fixed_join.vim
+++ b/plugin/fixed_join.vim
@@ -31,6 +31,15 @@ function! s:FixedJoin()
   let l:command = l:cursor_line . ',' . l:join_line . 'join'
   execute l:command
 
+  " Return the cursor to the saved position (Vim 6.0 fallback)
+  if exists('*cursor')
+    call cursor(l:cursor_line, l:cursor_col)
+  else
+    execute 'normal! '
+          \ . l:cursor_line . 'G'
+          \ . l:cursor_col . '|'
+  endif
+
 endfunction
 
 " Create modeless mapping target for the function just defined
-- 
cgit v1.2.3


From 3b04d608b77d431396cd8581663f5d44d297be41 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Thu, 28 Jun 2018 14:40:10 +1200
Subject: Bump VERSION

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 267577d..8f0916f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.4.1
+0.5.0
-- 
cgit v1.2.3