updated for version 7.4.386

Problem:    When splitting a window the changelist position is wrong.
Solution:   Copy the changelist position. (Jacob Niehus)

diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index 46cd6a90dea58ce0eab09579262f344460092c80..b4d829da039ea079957dbea839c740064a7e1c32 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -41,6 +41,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_qf_title.out \
+               test_changelist.out \
                test_eval.out \
                test_options.out
 
@@ -171,5 +172,6 @@ test_breakindent.out: test_breakindent.in
 test_listlbr.out: test_listlbr.in
 test_listlbr_utf8.out: test_listlbr_utf8.in
 test_qf_title.out: test_qf_title.in
+test_changelist.out: test_changelist.in
 test_eval.out: test_eval.in
 test_options.out: test_options.in

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 86176ae481f87fcec1381c8a213e9f34c4a6f72c..bd727b8ebd7cc6464ee4ce0d33988d6d62f9c9c7 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -40,6 +40,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_qf_title.out \
+               test_changelist.out \
                test_eval.out \
                test_options.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index cf10301b226bd44838b1e4343c8a15eabda5f5e2..0664a95983d40df520eeb8a745dce84d8f7e566a 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -60,6 +60,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_qf_title.out \
+               test_changelist.out \
                test_eval.out \
                test_options.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index a7f3989f8ee92d24508e4092d8f68ead5b2d7d4b..c66489c14af01b806225d1c4818d36bcaf84d7be 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -38,6 +38,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test100.out test101.out test102.out test103.out test104.out \
                test105.out test106.out test107.out \
                test_autoformat_join.out \
+               test_changelist.out \
                test_eval.out \
                test_breakindent.out \
                test_listlbr.out \

diff --git a/src/testdir/Make_vms.mms b/src/testdir/Make_vms.mms
index 9bf395be37f83bd108bbd126e5db20bfb113043b..1a45e35b792e89d3e937768ca73fd86d5bcef2ac 100644 (file)
--- a/src/testdir/Make_vms.mms
+++ b/src/testdir/Make_vms.mms
@@ -4,7 +4,7 @@
 # Authors:     Zoltan Arpadffy, <arpadffy@polarhome.com>
 #              Sandor Kopanyi,  <sandor.kopanyi@mailbox.hu>
 #
-# Last change:  2014 Jul 23
+# Last change:  2014 Jul 30
 #
 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
 # Edit the lines in the Configuration section below to select.
@@ -101,6 +101,7 @@ SCRIPT = test1.out  test2.out  test3.out  test4.out  test5.out  \
         test_listlbr.out \
         test_listlbr_utf8.out \
         test_qf_title.out \
+        test_changelist.out \
         test_eval.out \
         test_options.out
 

diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index b5f5d18030256b3ac80626abd833ba1a2894b3f5..4e4671d9bdd1d6a05db0a1e9151bbe19a3b70680 100644 (file)
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -38,6 +38,7 @@ SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
                test_listlbr.out \
                test_listlbr_utf8.out \
                test_qf_title.out \
+               test_changelist.out \
                test_eval.out \
                test_options.out
 

diff --git a/src/testdir/test_changelist.in b/src/testdir/test_changelist.in
new file mode 100644 (file)
index 0000000..6c7c430
--- /dev/null
+++ b/src/testdir/test_changelist.in
@@ -0,0 +1,22 @@
+Test changelist position after splitting window
+Set 'undolevels' to make changelist for sourced file
+
+STARTTEST
+:so small.vim
+Gkylp:set ul=100
+Gylp:set ul=100
+gg
+:vsplit
+:try
+:  normal g;
+:  normal ggVGcpass\e
+:catch
+:  normal ggVGcfail\e
+:finally
+:  %w! test.out
+:endtry
+:qa!
+ENDTEST
+
+1
+2

diff --git a/src/testdir/test_changelist.ok b/src/testdir/test_changelist.ok
new file mode 100644 (file)
index 0000000..2ae2839
--- /dev/null
+++ b/src/testdir/test_changelist.ok
@@ -0,0 +1 @@
+pass

diff --git a/src/version.c b/src/version.c
index 87b1942df9d5bddf4e191befd0a05fd66330ceea..3967da2c113fb776e55cb036a58553a2fff9b490 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    386,
 /**/
     385,
 /**/

diff --git a/src/window.c b/src/window.c
index 1cf861b476bb555c3c0f472e6ae6802752a7faaa..5012427fae37255016e267b889c4b3bcfba056e1 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1178,6 +1178,11 @@ win_split_ins(size, flags, new_wp, dir)
            p_wh = size;
     }
 
+#ifdef FEAT_JUMPLIST
+    /* Keep same changelist position in new window. */
+    wp->w_changelistidx = oldwin->w_changelistidx;
+#endif
+
     /*
      * make the new window the current window
      */