]> git.pld-linux.org Git - packages/vim.git/blame - 7.3.235
- rel 3; no more tinfo
[packages/vim.git] / 7.3.235
CommitLineData
a2e11672
AG
1To: vim_dev@googlegroups.com
2Subject: Patch 7.3.235
3Fcc: outbox
4From: Bram Moolenaar <Bram@moolenaar.net>
5Mime-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8------------
9
10Patch 7.3.235
11Problem: ";" gets stuck on a "t" command, it's not useful.
12Solution: Add the ';' flag in 'cpo'. (Christian Brabandt)
13Files: runtime/doc/motion.txt, runtime/doc/options.txt, src/option.h,
14 src/search.c src/testdir/test81.in, src/testdir/test81.ok,
15 src/testdir/Makefile, src/testdir/Make_amiga.mak,
16 src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
17 src/testdir/Make_os2.mak, src/testdir/Make_vms.mms
18
19
20*** ../vim-7.3.234/runtime/doc/motion.txt 2010-08-15 21:57:17.000000000 +0200
21--- runtime/doc/motion.txt 2011-06-26 05:15:58.000000000 +0200
22***************
23*** 269,279 ****
24 {char} can be entered like with the |f| command.
25
26 *;*
27! ; Repeat latest f, t, F or T [count] times.
28
29 *,*
30 , Repeat latest f, t, F or T in opposite direction
31! [count] times.
32
33 ==============================================================================
34 3. Up-down motions *up-down-motions*
35--- 269,279 ----
36 {char} can be entered like with the |f| command.
37
38 *;*
39! ; Repeat latest f, t, F or T [count] times. See |cpo-;|
40
41 *,*
42 , Repeat latest f, t, F or T in opposite direction
43! [count] times. See also |cpo-;|
44
45 ==============================================================================
46 3. Up-down motions *up-down-motions*
47*** ../vim-7.3.234/runtime/doc/options.txt 2011-06-12 20:42:17.000000000 +0200
48--- runtime/doc/options.txt 2011-06-26 05:15:58.000000000 +0200
49***************
50*** 2090,2095 ****
51--- 2117,2128 ----
52 *cpo->*
53 > When appending to a register, put a line break before
54 the appended text.
55+ *cpo-;*
56+ ; When using |,| or |;| to repeat the last |t| search
57+ and the cursor is right in front of the searched
58+ character, the cursor won't move. When not included,
59+ the cursor would skip over it and jump to the
60+ following occurence.
61
62 POSIX flags. These are not included in the Vi default value, except
63 when $VIM_POSIX was set on startup. |posix|
64*** ../vim-7.3.234/src/option.h 2011-06-12 22:13:37.000000000 +0200
65--- src/option.h 2011-06-26 05:17:58.000000000 +0200
66***************
67*** 169,178 ****
68 #define CPO_SUBPERCENT '/' /* % in :s string uses previous one */
69 #define CPO_BACKSL '\\' /* \ is not special in [] */
70 #define CPO_CHDIR '.' /* don't chdir if buffer is modified */
71 /* default values for Vim, Vi and POSIX */
72 #define CPO_VIM "aABceFs"
73! #define CPO_VI "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>"
74! #define CPO_ALL "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>#{|&/\\."
75
76 /* characters for p_ww option: */
77 #define WW_ALL "bshl<>[],~"
78--- 169,180 ----
79 #define CPO_SUBPERCENT '/' /* % in :s string uses previous one */
80 #define CPO_BACKSL '\\' /* \ is not special in [] */
81 #define CPO_CHDIR '.' /* don't chdir if buffer is modified */
82+ #define CPO_SCOLON ';' /* using "," and ";" will skip over char if
83+ * cursor would not move */
84 /* default values for Vim, Vi and POSIX */
85 #define CPO_VIM "aABceFs"
86! #define CPO_VI "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>;"
87! #define CPO_ALL "aAbBcCdDeEfFgHiIjJkKlLmMnoOpPqrRsStuvwWxXyZ$!%*-+<>#{|&/\\.;"
88
89 /* characters for p_ww option: */
90 #define WW_ALL "bshl<>[],~"
91*** ../vim-7.3.234/src/search.c 2011-05-10 16:41:13.000000000 +0200
92--- src/search.c 2011-06-26 05:20:45.000000000 +0200
93***************
94*** 1546,1551 ****
95--- 1546,1552 ----
96 int col;
97 char_u *p;
98 int len;
99+ int stop = TRUE;
100 #ifdef FEAT_MBYTE
101 static char_u bytes[MB_MAXBYTES];
102 static int bytelen = 1; /* >1 for multi-byte char */
103***************
104*** 1580,1585 ****
105--- 1581,1592 ----
106 t_cmd = last_t_cmd;
107 c = lastc;
108 /* For multi-byte re-use last bytes[] and bytelen. */
109+
110+ /* Force a move of at least one char, so ";" and "," will move the
111+ * cursor, even if the cursor is right in front of char we are looking
112+ * at. */
113+ if (vim_strchr(p_cpo, CPO_SCOLON) == NULL && count == 1)
114+ stop = FALSE;
115 }
116
117 if (dir == BACKWARD)
118***************
119*** 1612,1625 ****
120 }
121 if (bytelen == 1)
122 {
123! if (p[col] == c)
124 break;
125 }
126 else
127 {
128! if (vim_memcmp(p + col, bytes, bytelen) == 0)
129 break;
130 }
131 }
132 }
133 else
134--- 1619,1633 ----
135 }
136 if (bytelen == 1)
137 {
138! if (p[col] == c && stop)
139 break;
140 }
141 else
142 {
143! if (vim_memcmp(p + col, bytes, bytelen) == 0 && stop)
144 break;
145 }
146+ stop = TRUE;
147 }
148 }
149 else
150***************
151*** 1629,1636 ****
152 {
153 if ((col += dir) < 0 || col >= len)
154 return FAIL;
155! if (p[col] == c)
156 break;
157 }
158 }
159 }
160--- 1637,1645 ----
161 {
162 if ((col += dir) < 0 || col >= len)
163 return FAIL;
164! if (p[col] == c && stop)
165 break;
166+ stop = TRUE;
167 }
168 }
169 }
170*** ../vim-7.3.234/src/testdir/test81.in 2011-06-26 05:34:33.000000000 +0200
171--- src/testdir/test81.in 2011-06-26 05:30:31.000000000 +0200
172***************
173*** 0 ****
174--- 1,18 ----
175+ Test for t movement command and 'cpo-;' setting
176+
177+ STARTTEST
178+ :set nocompatible
179+ :set cpo-=;
180+ /firstline/
181+ j0tt;D
182+ $Ty;D:set cpo+=;
183+ j0tt;;D
184+ $Ty;;D:?firstline?+1,$w! test.out
185+ :qa!
186+ ENDTEST
187+
188+ firstline
189+ aaa two three four
190+ bbb yee yoo four
191+ ccc two three four
192+ ddd yee yoo four
193*** ../vim-7.3.234/src/testdir/test81.ok 2011-06-26 05:34:33.000000000 +0200
194--- src/testdir/test81.ok 2011-06-26 05:31:33.000000000 +0200
195***************
196*** 0 ****
197--- 1,4 ----
198+ aaa two
199+ bbb y
200+ ccc
201+ ddd yee y
202*** ../vim-7.3.234/src/testdir/Makefile 2011-06-19 04:31:54.000000000 +0200
203--- src/testdir/Makefile 2011-06-26 05:09:56.000000000 +0200
204***************
205*** 26,32 ****
206 test64.out test65.out test66.out test67.out test68.out \
207 test69.out test70.out test71.out test72.out test73.out \
208 test74.out test75.out test76.out test77.out test78.out \
209! test79.out test80.out
210
211 SCRIPTS_GUI = test16.out
212
213--- 26,32 ----
214 test64.out test65.out test66.out test67.out test68.out \
215 test69.out test70.out test71.out test72.out test73.out \
216 test74.out test75.out test76.out test77.out test78.out \
217! test79.out test80.out test81.out
218
219 SCRIPTS_GUI = test16.out
220
221*** ../vim-7.3.234/src/testdir/Make_amiga.mak 2011-06-19 04:31:54.000000000 +0200
222--- src/testdir/Make_amiga.mak 2011-06-26 05:09:07.000000000 +0200
223***************
224*** 28,34 ****
225 test61.out test62.out test63.out test64.out test65.out \
226 test66.out test67.out test68.out test69.out test70.out \
227 test71.out test72.out test73.out test74.out test75.out \
228! test76.out test77.out test78.out test79.out test80.out
229
230 .SUFFIXES: .in .out
231
232--- 28,35 ----
233 test61.out test62.out test63.out test64.out test65.out \
234 test66.out test67.out test68.out test69.out test70.out \
235 test71.out test72.out test73.out test74.out test75.out \
236! test76.out test77.out test78.out test79.out test80.out \
237! test81.out
238
239 .SUFFIXES: .in .out
240
241***************
242*** 128,130 ****
243--- 129,132 ----
244 test78.out: test78.in
245 test79.out: test79.in
246 test80.out: test80.in
247+ test81.out: test81.in
248*** ../vim-7.3.234/src/testdir/Make_dos.mak 2011-06-19 04:31:54.000000000 +0200
249--- src/testdir/Make_dos.mak 2011-06-26 05:09:16.000000000 +0200
250***************
251*** 29,35 ****
252 test42.out test52.out test65.out test66.out test67.out \
253 test68.out test69.out test71.out test72.out test73.out \
254 test74.out test75.out test76.out test77.out test78.out \
255! test79.out test80.out
256
257 SCRIPTS32 = test50.out test70.out
258
259--- 29,35 ----
260 test42.out test52.out test65.out test66.out test67.out \
261 test68.out test69.out test71.out test72.out test73.out \
262 test74.out test75.out test76.out test77.out test78.out \
263! test79.out test80.out test81.out
264
265 SCRIPTS32 = test50.out test70.out
266
267*** ../vim-7.3.234/src/testdir/Make_ming.mak 2011-06-19 04:31:54.000000000 +0200
268--- src/testdir/Make_ming.mak 2011-06-26 05:09:24.000000000 +0200
269***************
270*** 49,55 ****
271 test42.out test52.out test65.out test66.out test67.out \
272 test68.out test69.out test71.out test72.out test73.out \
273 test74.out test75.out test76.out test77.out test78.out \
274! test79.out test80.out
275
276 SCRIPTS32 = test50.out test70.out
277
278--- 49,55 ----
279 test42.out test52.out test65.out test66.out test67.out \
280 test68.out test69.out test71.out test72.out test73.out \
281 test74.out test75.out test76.out test77.out test78.out \
282! test79.out test80.out test81.out
283
284 SCRIPTS32 = test50.out test70.out
285
286*** ../vim-7.3.234/src/testdir/Make_os2.mak 2011-06-19 04:31:54.000000000 +0200
287--- src/testdir/Make_os2.mak 2011-06-26 05:09:33.000000000 +0200
288***************
289*** 28,34 ****
290 test61.out test62.out test63.out test64.out test65.out \
291 test66.out test67.out test68.out test69.out test70.out \
292 test71.out test72.out test73.out test74.out test75.out \
293! test76.out test77.out test78.out test79.out test80.out
294
295 .SUFFIXES: .in .out
296
297--- 28,35 ----
298 test61.out test62.out test63.out test64.out test65.out \
299 test66.out test67.out test68.out test69.out test70.out \
300 test71.out test72.out test73.out test74.out test75.out \
301! test76.out test77.out test78.out test79.out test80.out \
302! test81.out
303
304 .SUFFIXES: .in .out
305
306*** ../vim-7.3.234/src/testdir/Make_vms.mms 2011-06-19 04:31:54.000000000 +0200
307--- src/testdir/Make_vms.mms 2011-06-26 05:09:42.000000000 +0200
308***************
309*** 4,10 ****
310 # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
311 # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
312 #
313! # Last change: 2011 Jun 19
314 #
315 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
316 # Edit the lines in the Configuration section below to select.
317--- 4,10 ----
318 # Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
319 # Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
320 #
321! # Last change: 2011 Jun 26
322 #
323 # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
324 # Edit the lines in the Configuration section below to select.
325***************
326*** 75,81 ****
327 test61.out test62.out test63.out test64.out test65.out \
328 test66.out test67.out test68.out test69.out \
329 test71.out test72.out test74.out test75.out test76.out \
330! test77.out test78.out test79.out test80.out
331
332 # Known problems:
333 # Test 30: a problem around mac format - unknown reason
334--- 75,81 ----
335 test61.out test62.out test63.out test64.out test65.out \
336 test66.out test67.out test68.out test69.out \
337 test71.out test72.out test74.out test75.out test76.out \
338! test77.out test78.out test79.out test80.out test81.out
339
340 # Known problems:
341 # Test 30: a problem around mac format - unknown reason
342*** ../vim-7.3.234/src/version.c 2011-06-26 04:48:56.000000000 +0200
343--- src/version.c 2011-06-26 05:33:53.000000000 +0200
344***************
345*** 711,712 ****
346--- 711,714 ----
347 { /* Add new patch number below this line */
348+ /**/
349+ 235,
350 /**/
351
352--
353hundred-and-one symptoms of being an internet addict:
354226. You sit down at the computer right after dinner and your spouse
355 says "See you in the morning."
356
357 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
358/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
359\\\ an exciting new programming language -- http://www.Zimbu.org ///
360 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
This page took 0.063033 seconds and 4 git commands to generate.