|
 |
3ef2ca |
To: vim_dev@googlegroups.com
|
|
|
3ef2ca |
Subject: Patch 7.4.387
|
|
|
3ef2ca |
Fcc: outbox
|
|
|
3ef2ca |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
3ef2ca |
Mime-Version: 1.0
|
|
|
3ef2ca |
Content-Type: text/plain; charset=UTF-8
|
|
|
3ef2ca |
Content-Transfer-Encoding: 8bit
|
|
|
3ef2ca |
------------
|
|
|
3ef2ca |
|
|
|
3ef2ca |
Patch 7.4.387
|
|
|
3ef2ca |
Problem: "4gro" replaces one character then executes "ooo". (Urtica Dioica)
|
|
|
3ef2ca |
Solution: Write the ESC in the second stuff buffer.
|
|
|
3ef2ca |
Files: src/getchar.c, src/proto/getchar.pro, src/edit.c,
|
|
|
3ef2ca |
src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|
|
3ef2ca |
src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
|
|
|
3ef2ca |
src/testdir/Make_vms.mms, src/testdir/Makefile,
|
|
|
3ef2ca |
src/testdir/test_insertcount.in, src/testdir/test_insertcount.ok
|
|
|
3ef2ca |
|
|
|
3ef2ca |
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/getchar.c 2014-07-23 20:41:09.891779510 +0200
|
|
|
3ef2ca |
--- src/getchar.c 2014-07-30 14:35:08.831590415 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 678,683 ****
|
|
|
3ef2ca |
--- 678,694 ----
|
|
|
3ef2ca |
add_buff(&readbuf1, s, -1L);
|
|
|
3ef2ca |
}
|
|
|
3ef2ca |
|
|
|
3ef2ca |
+ /*
|
|
|
3ef2ca |
+ * Append string "s" to the redo stuff buffer.
|
|
|
3ef2ca |
+ * CSI and K_SPECIAL must already have been escaped.
|
|
|
3ef2ca |
+ */
|
|
|
3ef2ca |
+ void
|
|
|
3ef2ca |
+ stuffRedoReadbuff(s)
|
|
|
3ef2ca |
+ char_u *s;
|
|
|
3ef2ca |
+ {
|
|
|
3ef2ca |
+ add_buff(&readbuf2, s, -1L);
|
|
|
3ef2ca |
+ }
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
void
|
|
|
3ef2ca |
stuffReadbuffLen(s, len)
|
|
|
3ef2ca |
char_u *s;
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/proto/getchar.pro 2014-02-11 15:10:38.134111836 +0100
|
|
|
3ef2ca |
--- src/proto/getchar.pro 2014-07-30 14:36:18.851589912 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 15,20 ****
|
|
|
3ef2ca |
--- 15,21 ----
|
|
|
3ef2ca |
void AppendCharToRedobuff __ARGS((int c));
|
|
|
3ef2ca |
void AppendNumberToRedobuff __ARGS((long n));
|
|
|
3ef2ca |
void stuffReadbuff __ARGS((char_u *s));
|
|
|
3ef2ca |
+ void stuffRedoReadbuff __ARGS((char_u *s));
|
|
|
3ef2ca |
void stuffReadbuffLen __ARGS((char_u *s, long len));
|
|
|
3ef2ca |
void stuffReadbuffSpec __ARGS((char_u *s));
|
|
|
3ef2ca |
void stuffcharReadbuff __ARGS((int c));
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/edit.c 2014-07-23 17:39:21.815857910 +0200
|
|
|
3ef2ca |
--- src/edit.c 2014-07-30 14:47:56.875584895 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 8389,8395 ****
|
|
|
3ef2ca |
|
|
|
3ef2ca |
(void)start_redo_ins();
|
|
|
3ef2ca |
if (cmdchar == 'r' || cmdchar == 'v')
|
|
|
3ef2ca |
! stuffReadbuff(ESC_STR); /* no ESC in redo buffer */
|
|
|
3ef2ca |
++RedrawingDisabled;
|
|
|
3ef2ca |
disabled_redraw = TRUE;
|
|
|
3ef2ca |
return FALSE; /* repeat the insert */
|
|
|
3ef2ca |
--- 8389,8395 ----
|
|
|
3ef2ca |
|
|
|
3ef2ca |
(void)start_redo_ins();
|
|
|
3ef2ca |
if (cmdchar == 'r' || cmdchar == 'v')
|
|
|
3ef2ca |
! stuffRedoReadbuff(ESC_STR); /* no ESC in redo buffer */
|
|
|
3ef2ca |
++RedrawingDisabled;
|
|
|
3ef2ca |
disabled_redraw = TRUE;
|
|
|
3ef2ca |
return FALSE; /* repeat the insert */
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/Make_amiga.mak 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/testdir/Make_amiga.mak 2014-07-30 15:57:52.819554737 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 43,48 ****
|
|
|
3ef2ca |
--- 43,49 ----
|
|
|
3ef2ca |
test_qf_title.out \
|
|
|
3ef2ca |
test_changelist.out \
|
|
|
3ef2ca |
test_eval.out \
|
|
|
3ef2ca |
+ test_insertcount.out \
|
|
|
3ef2ca |
test_options.out
|
|
|
3ef2ca |
|
|
|
3ef2ca |
.SUFFIXES: .in .out
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 174,177 ****
|
|
|
3ef2ca |
--- 175,179 ----
|
|
|
3ef2ca |
test_qf_title.out: test_qf_title.in
|
|
|
3ef2ca |
test_changelist.out: test_changelist.in
|
|
|
3ef2ca |
test_eval.out: test_eval.in
|
|
|
3ef2ca |
+ test_insertcount.out: test_insertcount.in
|
|
|
3ef2ca |
test_options.out: test_options.in
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/Make_dos.mak 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/testdir/Make_dos.mak 2014-07-30 15:57:59.071554692 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 42,47 ****
|
|
|
3ef2ca |
--- 42,48 ----
|
|
|
3ef2ca |
test_qf_title.out \
|
|
|
3ef2ca |
test_changelist.out \
|
|
|
3ef2ca |
test_eval.out \
|
|
|
3ef2ca |
+ test_insertcount.out \
|
|
|
3ef2ca |
test_options.out
|
|
|
3ef2ca |
|
|
|
3ef2ca |
SCRIPTS32 = test50.out test70.out
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/Make_ming.mak 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/testdir/Make_ming.mak 2014-07-30 15:58:02.351554669 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 62,67 ****
|
|
|
3ef2ca |
--- 62,68 ----
|
|
|
3ef2ca |
test_qf_title.out \
|
|
|
3ef2ca |
test_changelist.out \
|
|
|
3ef2ca |
test_eval.out \
|
|
|
3ef2ca |
+ test_insertcount.out \
|
|
|
3ef2ca |
test_options.out
|
|
|
3ef2ca |
|
|
|
3ef2ca |
SCRIPTS32 = test50.out test70.out
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/Make_os2.mak 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/testdir/Make_os2.mak 2014-07-30 15:58:05.975554643 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 40,45 ****
|
|
|
3ef2ca |
--- 40,46 ----
|
|
|
3ef2ca |
test_autoformat_join.out \
|
|
|
3ef2ca |
test_changelist.out \
|
|
|
3ef2ca |
test_eval.out \
|
|
|
3ef2ca |
+ test_insertcount.out \
|
|
|
3ef2ca |
test_breakindent.out \
|
|
|
3ef2ca |
test_listlbr.out \
|
|
|
3ef2ca |
test_listlbr_utf8.out \
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/Make_vms.mms 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/testdir/Make_vms.mms 2014-07-30 15:58:10.099554613 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 103,108 ****
|
|
|
3ef2ca |
--- 103,109 ----
|
|
|
3ef2ca |
test_qf_title.out \
|
|
|
3ef2ca |
test_changelist.out \
|
|
|
3ef2ca |
test_eval.out \
|
|
|
3ef2ca |
+ test_insertcount.out \
|
|
|
3ef2ca |
test_options.out
|
|
|
3ef2ca |
|
|
|
3ef2ca |
# Known problems:
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/Makefile 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/testdir/Makefile 2014-07-30 15:58:16.539554567 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 40,45 ****
|
|
|
3ef2ca |
--- 40,46 ----
|
|
|
3ef2ca |
test_qf_title.out \
|
|
|
3ef2ca |
test_changelist.out \
|
|
|
3ef2ca |
test_eval.out \
|
|
|
3ef2ca |
+ test_insertcount.out \
|
|
|
3ef2ca |
test_options.out
|
|
|
3ef2ca |
|
|
|
3ef2ca |
SCRIPTS_GUI = test16.out
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/test_insertcount.in 2014-07-30 15:56:12.087555461 +0200
|
|
|
3ef2ca |
--- src/testdir/test_insertcount.in 2014-07-30 14:47:36.335585043 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 0 ****
|
|
|
3ef2ca |
--- 1,14 ----
|
|
|
3ef2ca |
+ Tests for repeating insert and replace.
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
+ STARTTEST
|
|
|
3ef2ca |
+ :so small.vim
|
|
|
3ef2ca |
+ :/Second
|
|
|
3ef2ca |
+ 4gro
|
|
|
3ef2ca |
+ :/^First/,$wq! test.out
|
|
|
3ef2ca |
+ :" get here when failed and in Insert mode
|
|
|
3ef2ca |
+ ?:.wq! test.out
|
|
|
3ef2ca |
+ ENDTEST
|
|
|
3ef2ca |
+
|
|
|
3ef2ca |
+ First line
|
|
|
3ef2ca |
+ Second line
|
|
|
3ef2ca |
+ Last line
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/testdir/test_insertcount.ok 2014-07-30 15:56:12.091555461 +0200
|
|
|
3ef2ca |
--- src/testdir/test_insertcount.ok 2014-07-30 14:45:43.491585854 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 0 ****
|
|
|
3ef2ca |
--- 1,3 ----
|
|
|
3ef2ca |
+ First line
|
|
|
3ef2ca |
+ ooooecond line
|
|
|
3ef2ca |
+ Last line
|
|
|
3ef2ca |
*** ../vim-7.4.386/src/version.c 2014-07-30 14:04:49.131603494 +0200
|
|
|
3ef2ca |
--- src/version.c 2014-07-30 14:48:45.039584549 +0200
|
|
|
3ef2ca |
***************
|
|
|
3ef2ca |
*** 736,737 ****
|
|
|
3ef2ca |
--- 736,739 ----
|
|
|
3ef2ca |
{ /* Add new patch number below this line */
|
|
|
3ef2ca |
+ /**/
|
|
|
3ef2ca |
+ 387,
|
|
|
3ef2ca |
/**/
|
|
|
3ef2ca |
|
|
|
3ef2ca |
--
|
|
|
3ef2ca |
If your company is not involved in something called "ISO 9000" you probably
|
|
|
3ef2ca |
have no idea what it is. If your company _is_ involved in ISO 9000 then you
|
|
|
3ef2ca |
definitely have no idea what it is.
|
|
|
3ef2ca |
(Scott Adams - The Dilbert principle)
|
|
|
3ef2ca |
|
|
|
3ef2ca |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
3ef2ca |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
3ef2ca |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
3ef2ca |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|