# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1491053404 -7200
# Node ID d772bf077b3fa469658f6a7b3bc1eac95460fb29
# Parent  6a79bcf55287be0c327b72fcea06d514c02fad07
patch 8.0.0533: abbreviation doesn't work after backspacing newline

commit https://github.com/vim/vim/commit/878c263a489b7e211eda31fa13a3d5ad9e120554
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Apr 1 15:15:52 2017 +0200

    patch 8.0.0533: abbreviation doesn't work after backspacing newline

    Problem:    Abbreviation doesn't work after backspacing newline. (Hkonrk)
    Solution:   Set the insert start column. (closes https://github.com/vim/vim/issues/1609)

diff --git a/src/edit.c b/src/edit.c
--- a/src/edit.c
+++ b/src/edit.c
@@ -9017,7 +9017,7 @@ ins_bs(
 #endif
 
     /*
-     * delete newline!
+     * Delete newline!
      */
     if (curwin->w_cursor.col == 0)
     {
@@ -9032,7 +9032,7 @@ ins_bs(
 			       (linenr_T)(curwin->w_cursor.lnum + 1)) == FAIL)
 		return FALSE;
 	    --Insstart.lnum;
-	    Insstart.col = MAXCOL;
+	    Insstart.col = STRLEN(ml_get(Insstart.lnum));
 	}
 	/*
 	 * In replace mode:
diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -160,3 +160,14 @@ func Test_map_meta_quotes()
   set nomodified
   iunmap <M-">
 endfunc
+
+func Test_abbr_after_line_join()
+  new
+  abbr foo bar
+  set backspace=indent,eol,start
+  exe "normal o\<BS>foo "
+  call assert_equal("bar ", getline(1))
+  bwipe!
+  unabbr foo
+  set backspace&
+endfunc
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    533,
+/**/
     532,
 /**/
     531,