summaryrefslogtreecommitdiff
path: root/data/vim/patches/8.1.0640
blob: bd6b4cce6c4271f1617eea05328b489da36f24c2 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0640
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.0640
Problem:    Get E14 while typing command :tab with 'incsearch' set.
Solution:   Do not give an error when looking for the command. (Yasuhiro
            Higashi)
Files:	    src/testdir/test_search.vim, src/ex_docmd.c


*** ../vim-8.1.0639/src/testdir/test_search.vim	2018-12-14 15:46:59.519914793 +0100
--- src/testdir/test_search.vim	2018-12-26 21:33:59.884818533 +0100
***************
*** 783,788 ****
--- 783,802 ----
    bwipe!
  endfunc
  
+ func Test_incsearch_cmdline_modifier()
+   if !exists('+incsearch')
+     return
+   endif
+   call test_override("char_avail", 1)
+   new
+   call setline(1, ['foo'])
+   set incsearch
+   " Test that error E14 does not occur in parsing command modifier.
+   call feedkeys("V:tab", 'tx')
+ 
+   call Incsearch_cleanup()
+ endfunc
+ 
  func Test_incsearch_scrolling()
    if !CanRunVimInTerminal()
      return
*** ../vim-8.1.0639/src/ex_docmd.c	2018-12-23 19:10:05.010359907 +0100
--- src/ex_docmd.c	2018-12-26 21:39:50.810259883 +0100
***************
*** 2827,2844 ****
  
  	    case 't':	if (checkforcmd(&p, "tab", 3))
  			{
! 			    long tabnr = get_address(eap, &eap->cmd, ADDR_TABS,
! 					       eap->skip, skip_only, FALSE, 1);
! 			    if (tabnr == MAXLNUM)
! 				cmdmod.tab = tabpage_index(curtab) + 1;
! 			    else
  			    {
! 				if (tabnr < 0 || tabnr > LAST_TAB_NR)
  				{
! 				    *errormsg = (char_u *)_(e_invrange);
! 				    return FAIL;
  				}
- 				cmdmod.tab = tabnr + 1;
  			    }
  			    eap->cmd = p;
  			    continue;
--- 2827,2848 ----
  
  	    case 't':	if (checkforcmd(&p, "tab", 3))
  			{
! 			    if (!skip_only)
  			    {
! 				long tabnr = get_address(eap, &eap->cmd,
! 						    ADDR_TABS, eap->skip,
! 						    skip_only, FALSE, 1);
! 				if (tabnr == MAXLNUM)
! 				    cmdmod.tab = tabpage_index(curtab) + 1;
! 				else
  				{
! 				    if (tabnr < 0 || tabnr > LAST_TAB_NR)
! 				    {
! 					*errormsg = (char_u *)_(e_invrange);
! 					return FAIL;
! 				    }
! 				    cmdmod.tab = tabnr + 1;
  				}
  			    }
  			    eap->cmd = p;
  			    continue;
*** ../vim-8.1.0639/src/version.c	2018-12-26 01:08:56.344312939 +0100
--- src/version.c	2018-12-26 21:44:08.068293990 +0100
***************
*** 801,802 ****
--- 801,804 ----
  {   /* Add new patch number below this line */
+ /**/
+     640,
  /**/

-- 
Never go to the toilet in a paperless office.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///