|
 |
073263 |
To: vim_dev@googlegroups.com
|
|
|
073263 |
Subject: Patch 7.4.386
|
|
|
073263 |
Fcc: outbox
|
|
|
073263 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
073263 |
Mime-Version: 1.0
|
|
|
073263 |
Content-Type: text/plain; charset=UTF-8
|
|
|
073263 |
Content-Transfer-Encoding: 8bit
|
|
|
073263 |
------------
|
|
|
073263 |
|
|
|
073263 |
Patch 7.4.386
|
|
|
073263 |
Problem: When splitting a window the changelist position is wrong.
|
|
|
073263 |
Solution: Copy the changelist position. (Jacob Niehus)
|
|
|
073263 |
Files: src/window.c, src/testdir/Make_amiga.mak,
|
|
|
073263 |
src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
|
|
|
073263 |
src/testdir/Make_os2.mak, src/testdir/Make_vms.mms,
|
|
|
073263 |
src/testdir/Makefile, src/testdir/test_changelist.in,
|
|
|
073263 |
src/testdir/test_changelist.ok
|
|
|
073263 |
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.385/src/window.c 2014-07-23 15:21:16.247917462 +0200
|
|
|
073263 |
--- src/window.c 2014-07-30 13:55:49.275607374 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 1178,1183 ****
|
|
|
073263 |
--- 1178,1188 ----
|
|
|
073263 |
p_wh = size;
|
|
|
073263 |
}
|
|
|
073263 |
|
|
|
073263 |
+ #ifdef FEAT_JUMPLIST
|
|
|
073263 |
+ /* Keep same changelist position in new window. */
|
|
|
073263 |
+ wp->w_changelistidx = oldwin->w_changelistidx;
|
|
|
073263 |
+ #endif
|
|
|
073263 |
+
|
|
|
073263 |
/*
|
|
|
073263 |
* make the new window the current window
|
|
|
073263 |
*/
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/Make_amiga.mak 2014-07-23 15:54:43.443903036 +0200
|
|
|
073263 |
--- src/testdir/Make_amiga.mak 2014-07-30 13:54:06.871608110 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 41,46 ****
|
|
|
073263 |
--- 41,47 ----
|
|
|
073263 |
test_listlbr.out \
|
|
|
073263 |
test_listlbr_utf8.out \
|
|
|
073263 |
test_qf_title.out \
|
|
|
073263 |
+ test_changelist.out \
|
|
|
073263 |
test_eval.out \
|
|
|
073263 |
test_options.out
|
|
|
073263 |
|
|
|
073263 |
***************
|
|
|
073263 |
*** 171,175 ****
|
|
|
073263 |
--- 172,177 ----
|
|
|
073263 |
test_listlbr.out: test_listlbr.in
|
|
|
073263 |
test_listlbr_utf8.out: test_listlbr_utf8.in
|
|
|
073263 |
test_qf_title.out: test_qf_title.in
|
|
|
073263 |
+ test_changelist.out: test_changelist.in
|
|
|
073263 |
test_eval.out: test_eval.in
|
|
|
073263 |
test_options.out: test_options.in
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/Make_dos.mak 2014-07-23 15:54:43.443903036 +0200
|
|
|
073263 |
--- src/testdir/Make_dos.mak 2014-07-30 13:54:16.091608044 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 40,45 ****
|
|
|
073263 |
--- 40,46 ----
|
|
|
073263 |
test_listlbr.out \
|
|
|
073263 |
test_listlbr_utf8.out \
|
|
|
073263 |
test_qf_title.out \
|
|
|
073263 |
+ test_changelist.out \
|
|
|
073263 |
test_eval.out \
|
|
|
073263 |
test_options.out
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/Make_ming.mak 2014-07-23 15:54:43.443903036 +0200
|
|
|
073263 |
--- src/testdir/Make_ming.mak 2014-07-30 13:54:19.775608018 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 60,65 ****
|
|
|
073263 |
--- 60,66 ----
|
|
|
073263 |
test_listlbr.out \
|
|
|
073263 |
test_listlbr_utf8.out \
|
|
|
073263 |
test_qf_title.out \
|
|
|
073263 |
+ test_changelist.out \
|
|
|
073263 |
test_eval.out \
|
|
|
073263 |
test_options.out
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/Make_os2.mak 2014-07-23 15:54:43.443903036 +0200
|
|
|
073263 |
--- src/testdir/Make_os2.mak 2014-07-30 13:54:24.207607986 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 38,43 ****
|
|
|
073263 |
--- 38,44 ----
|
|
|
073263 |
test100.out test101.out test102.out test103.out test104.out \
|
|
|
073263 |
test105.out test106.out test107.out \
|
|
|
073263 |
test_autoformat_join.out \
|
|
|
073263 |
+ test_changelist.out \
|
|
|
073263 |
test_eval.out \
|
|
|
073263 |
test_breakindent.out \
|
|
|
073263 |
test_listlbr.out \
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/Make_vms.mms 2014-07-23 15:54:43.443903036 +0200
|
|
|
073263 |
--- src/testdir/Make_vms.mms 2014-07-30 13:54:31.151607936 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 4,10 ****
|
|
|
073263 |
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
|
|
073263 |
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
|
|
073263 |
#
|
|
|
073263 |
! # Last change: 2014 Jul 23
|
|
|
073263 |
#
|
|
|
073263 |
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
|
|
073263 |
# Edit the lines in the Configuration section below to select.
|
|
|
073263 |
--- 4,10 ----
|
|
|
073263 |
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
|
|
073263 |
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
|
|
073263 |
#
|
|
|
073263 |
! # Last change: 2014 Jul 30
|
|
|
073263 |
#
|
|
|
073263 |
# This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
|
|
|
073263 |
# Edit the lines in the Configuration section below to select.
|
|
|
073263 |
***************
|
|
|
073263 |
*** 101,106 ****
|
|
|
073263 |
--- 101,107 ----
|
|
|
073263 |
test_listlbr.out \
|
|
|
073263 |
test_listlbr_utf8.out \
|
|
|
073263 |
test_qf_title.out \
|
|
|
073263 |
+ test_changelist.out \
|
|
|
073263 |
test_eval.out \
|
|
|
073263 |
test_options.out
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/Makefile 2014-07-23 15:54:43.443903036 +0200
|
|
|
073263 |
--- src/testdir/Makefile 2014-07-30 13:54:45.291607834 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 38,43 ****
|
|
|
073263 |
--- 38,44 ----
|
|
|
073263 |
test_listlbr.out \
|
|
|
073263 |
test_listlbr_utf8.out \
|
|
|
073263 |
test_qf_title.out \
|
|
|
073263 |
+ test_changelist.out \
|
|
|
073263 |
test_eval.out \
|
|
|
073263 |
test_options.out
|
|
|
073263 |
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/test_changelist.in 2014-07-30 14:04:27.507603650 +0200
|
|
|
073263 |
--- src/testdir/test_changelist.in 2014-07-30 13:52:21.363608869 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 0 ****
|
|
|
073263 |
--- 1,22 ----
|
|
|
073263 |
+ Test changelist position after splitting window
|
|
|
073263 |
+ Set 'undolevels' to make changelist for sourced file
|
|
|
073263 |
+
|
|
|
073263 |
+ STARTTEST
|
|
|
073263 |
+ :so small.vim
|
|
|
073263 |
+ Gkylp:set ul=100
|
|
|
073263 |
+ Gylp:set ul=100
|
|
|
073263 |
+ gg
|
|
|
073263 |
+ :vsplit
|
|
|
073263 |
+ :try
|
|
|
073263 |
+ : normal g;
|
|
|
073263 |
+ : normal ggVGcpass?
|
|
|
073263 |
+ :catch
|
|
|
073263 |
+ : normal ggVGcfail?
|
|
|
073263 |
+ :finally
|
|
|
073263 |
+ : %w! test.out
|
|
|
073263 |
+ :endtry
|
|
|
073263 |
+ :qa!
|
|
|
073263 |
+ ENDTEST
|
|
|
073263 |
+
|
|
|
073263 |
+ 1
|
|
|
073263 |
+ 2
|
|
|
073263 |
*** ../vim-7.4.385/src/testdir/test_changelist.ok 2014-07-30 14:04:27.515603650 +0200
|
|
|
073263 |
--- src/testdir/test_changelist.ok 2014-07-30 13:53:41.991608289 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 0 ****
|
|
|
073263 |
--- 1 ----
|
|
|
073263 |
+ pass
|
|
|
073263 |
*** ../vim-7.4.385/src/version.c 2014-07-30 13:22:48.271621613 +0200
|
|
|
073263 |
--- src/version.c 2014-07-30 13:56:49.951606938 +0200
|
|
|
073263 |
***************
|
|
|
073263 |
*** 736,737 ****
|
|
|
073263 |
--- 736,739 ----
|
|
|
073263 |
{ /* Add new patch number below this line */
|
|
|
073263 |
+ /**/
|
|
|
073263 |
+ 386,
|
|
|
073263 |
/**/
|
|
|
073263 |
|
|
|
073263 |
--
|
|
|
073263 |
Our job was to build a computer information system for the branch banks. We
|
|
|
073263 |
were the perfect people for the job: Dean had seen a computer once, and I had
|
|
|
073263 |
heard Dean talk about it.
|
|
|
073263 |
(Scott Adams - The Dilbert principle)
|
|
|
073263 |
|
|
|
073263 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
073263 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
073263 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
073263 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|