Merge remote branch 'fedora/f19' into rhel-7.0
This commit is contained in:
Daniel Mach
commit
15a47c85f2
212
7.3.336
212
7.3.336
@ -880,7 +880,7 @@ Files: src/tag.c, src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|||||||
*** 0 ****
|
*** 0 ****
|
||||||
--- 1,2 ----
|
--- 1,2 ----
|
||||||
+ !_TAG_FILE_ENCODING cp932 //
|
+ !_TAG_FILE_ENCODING cp932 //
|
||||||
+ `ab Xtags2.txt /`ab
|
+ ‚`‚a‚b Xtags2.txt /‚`‚a‚b
|
||||||
*** ../vim-7.3.335/src/testdir/test83-tags3 2011-10-12 19:49:38.000000000 +0200
|
*** ../vim-7.3.335/src/testdir/test83-tags3 2011-10-12 19:49:38.000000000 +0200
|
||||||
--- src/testdir/test83-tags3 2011-10-12 19:35:42.000000000 +0200
|
--- src/testdir/test83-tags3 2011-10-12 19:35:42.000000000 +0200
|
||||||
***************
|
***************
|
||||||
@ -888,106 +888,106 @@ Files: src/tag.c, src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|||||||
--- 1,102 ----
|
--- 1,102 ----
|
||||||
+ !_TAG_FILE_SORTED 1 //
|
+ !_TAG_FILE_SORTED 1 //
|
||||||
+ !_TAG_FILE_ENCODING cp932 //
|
+ !_TAG_FILE_ENCODING cp932 //
|
||||||
+ abc1 Xtags3.txt /`ab
|
+ abc1 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc2 Xtags3.txt /`ab
|
+ abc2 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc3 Xtags3.txt /`ab
|
+ abc3 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc4 Xtags3.txt /`ab
|
+ abc4 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc5 Xtags3.txt /`ab
|
+ abc5 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc6 Xtags3.txt /`ab
|
+ abc6 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc7 Xtags3.txt /`ab
|
+ abc7 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc8 Xtags3.txt /`ab
|
+ abc8 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc9 Xtags3.txt /`ab
|
+ abc9 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc10 Xtags3.txt /`ab
|
+ abc10 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc11 Xtags3.txt /`ab
|
+ abc11 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc12 Xtags3.txt /`ab
|
+ abc12 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc13 Xtags3.txt /`ab
|
+ abc13 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc14 Xtags3.txt /`ab
|
+ abc14 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc15 Xtags3.txt /`ab
|
+ abc15 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc16 Xtags3.txt /`ab
|
+ abc16 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc17 Xtags3.txt /`ab
|
+ abc17 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc18 Xtags3.txt /`ab
|
+ abc18 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc19 Xtags3.txt /`ab
|
+ abc19 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc20 Xtags3.txt /`ab
|
+ abc20 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc21 Xtags3.txt /`ab
|
+ abc21 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc22 Xtags3.txt /`ab
|
+ abc22 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc23 Xtags3.txt /`ab
|
+ abc23 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc24 Xtags3.txt /`ab
|
+ abc24 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc25 Xtags3.txt /`ab
|
+ abc25 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc26 Xtags3.txt /`ab
|
+ abc26 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc27 Xtags3.txt /`ab
|
+ abc27 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc28 Xtags3.txt /`ab
|
+ abc28 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc29 Xtags3.txt /`ab
|
+ abc29 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc30 Xtags3.txt /`ab
|
+ abc30 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc31 Xtags3.txt /`ab
|
+ abc31 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc32 Xtags3.txt /`ab
|
+ abc32 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc33 Xtags3.txt /`ab
|
+ abc33 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc34 Xtags3.txt /`ab
|
+ abc34 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc35 Xtags3.txt /`ab
|
+ abc35 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc36 Xtags3.txt /`ab
|
+ abc36 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc37 Xtags3.txt /`ab
|
+ abc37 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc38 Xtags3.txt /`ab
|
+ abc38 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc39 Xtags3.txt /`ab
|
+ abc39 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc40 Xtags3.txt /`ab
|
+ abc40 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc41 Xtags3.txt /`ab
|
+ abc41 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc42 Xtags3.txt /`ab
|
+ abc42 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc43 Xtags3.txt /`ab
|
+ abc43 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc44 Xtags3.txt /`ab
|
+ abc44 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc45 Xtags3.txt /`ab
|
+ abc45 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc46 Xtags3.txt /`ab
|
+ abc46 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc47 Xtags3.txt /`ab
|
+ abc47 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc48 Xtags3.txt /`ab
|
+ abc48 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc49 Xtags3.txt /`ab
|
+ abc49 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc50 Xtags3.txt /`ab
|
+ abc50 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc51 Xtags3.txt /`ab
|
+ abc51 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc52 Xtags3.txt /`ab
|
+ abc52 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc53 Xtags3.txt /`ab
|
+ abc53 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc54 Xtags3.txt /`ab
|
+ abc54 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc55 Xtags3.txt /`ab
|
+ abc55 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc56 Xtags3.txt /`ab
|
+ abc56 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc57 Xtags3.txt /`ab
|
+ abc57 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc58 Xtags3.txt /`ab
|
+ abc58 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc59 Xtags3.txt /`ab
|
+ abc59 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc60 Xtags3.txt /`ab
|
+ abc60 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc61 Xtags3.txt /`ab
|
+ abc61 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc62 Xtags3.txt /`ab
|
+ abc62 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc63 Xtags3.txt /`ab
|
+ abc63 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc64 Xtags3.txt /`ab
|
+ abc64 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc65 Xtags3.txt /`ab
|
+ abc65 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc66 Xtags3.txt /`ab
|
+ abc66 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc67 Xtags3.txt /`ab
|
+ abc67 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc68 Xtags3.txt /`ab
|
+ abc68 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc69 Xtags3.txt /`ab
|
+ abc69 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc70 Xtags3.txt /`ab
|
+ abc70 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc71 Xtags3.txt /`ab
|
+ abc71 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc72 Xtags3.txt /`ab
|
+ abc72 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc73 Xtags3.txt /`ab
|
+ abc73 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc74 Xtags3.txt /`ab
|
+ abc74 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc75 Xtags3.txt /`ab
|
+ abc75 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc76 Xtags3.txt /`ab
|
+ abc76 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc77 Xtags3.txt /`ab
|
+ abc77 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc78 Xtags3.txt /`ab
|
+ abc78 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc79 Xtags3.txt /`ab
|
+ abc79 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc80 Xtags3.txt /`ab
|
+ abc80 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc81 Xtags3.txt /`ab
|
+ abc81 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc82 Xtags3.txt /`ab
|
+ abc82 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc83 Xtags3.txt /`ab
|
+ abc83 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc84 Xtags3.txt /`ab
|
+ abc84 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc85 Xtags3.txt /`ab
|
+ abc85 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc86 Xtags3.txt /`ab
|
+ abc86 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc87 Xtags3.txt /`ab
|
+ abc87 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc88 Xtags3.txt /`ab
|
+ abc88 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc89 Xtags3.txt /`ab
|
+ abc89 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc90 Xtags3.txt /`ab
|
+ abc90 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc91 Xtags3.txt /`ab
|
+ abc91 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc92 Xtags3.txt /`ab
|
+ abc92 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc93 Xtags3.txt /`ab
|
+ abc93 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc94 Xtags3.txt /`ab
|
+ abc94 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc95 Xtags3.txt /`ab
|
+ abc95 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc96 Xtags3.txt /`ab
|
+ abc96 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc97 Xtags3.txt /`ab
|
+ abc97 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc98 Xtags3.txt /`ab
|
+ abc98 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc99 Xtags3.txt /`ab
|
+ abc99 Xtags3.txt /‚`‚a‚b
|
||||||
+ abc100 Xtags3.txt /`ab
|
+ abc100 Xtags3.txt /‚`‚a‚b
|
||||||
*** ../vim-7.3.335/src/testdir/test83.in 2011-10-12 19:49:38.000000000 +0200
|
*** ../vim-7.3.335/src/testdir/test83.in 2011-10-12 19:49:38.000000000 +0200
|
||||||
--- src/testdir/test83.in 2011-10-12 19:40:47.000000000 +0200
|
--- src/testdir/test83.in 2011-10-12 19:40:47.000000000 +0200
|
||||||
***************
|
***************
|
||||||
@ -1030,8 +1030,8 @@ Files: src/tag.c, src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|||||||
+ :new
|
+ :new
|
||||||
+ :set tags=test83-tags2
|
+ :set tags=test83-tags2
|
||||||
+ :let v:errmsg = ''
|
+ :let v:errmsg = ''
|
||||||
+ :tag /.ＢＣ
|
+ :tag /.ＢＣ
|
||||||
+ :if v:errmsg =~ 'E426:' || getline('.') != 'ＡＢＣ'
|
+ :if v:errmsg =~ 'E426:' || getline('.') != 'ＡＢＣ'
|
||||||
+ : close
|
+ : close
|
||||||
+ : put ='case2: failed'
|
+ : put ='case2: failed'
|
||||||
+ :else
|
+ :else
|
||||||
@ -1044,7 +1044,7 @@ Files: src/tag.c, src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|||||||
+ :set tags=test83-tags3
|
+ :set tags=test83-tags3
|
||||||
+ :let v:errmsg = ''
|
+ :let v:errmsg = ''
|
||||||
+ :tag abc50
|
+ :tag abc50
|
||||||
+ :if v:errmsg =~ 'E426:' || getline('.') != 'ＡＢＣ'
|
+ :if v:errmsg =~ 'E426:' || getline('.') != 'ＡＢＣ'
|
||||||
+ : close
|
+ : close
|
||||||
+ : put ='case3: failed'
|
+ : put ='case3: failed'
|
||||||
+ :else
|
+ :else
|
||||||
@ -1060,10 +1060,10 @@ Files: src/tag.c, src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
|
|||||||
+ abcdefghijklmnopqrs
|
+ abcdefghijklmnopqrs
|
||||||
+
|
+
|
||||||
+ text for tags2
|
+ text for tags2
|
||||||
+ ＡＢＣ
|
+ ＡＢＣ
|
||||||
+
|
+
|
||||||
+ text for tags3
|
+ text for tags3
|
||||||
+ ＡＢＣ
|
+ ＡＢＣ
|
||||||
+
|
+
|
||||||
+ tags1
|
+ tags1
|
||||||
+ !_TAG_FILE_ENCODING utf-8 //
|
+ !_TAG_FILE_ENCODING utf-8 //
|
||||||
|
|||||||
114
7.3.713
Normal file
114
7.3.713
Normal file
@ -0,0 +1,114 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.713
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.713
|
||||||
|
Problem: printf() can only align to bytes, not characters.
|
||||||
|
Solution: Add the "S" item. (Christian Brabandt)
|
||||||
|
Files: runtime/doc/eval.txt, src/message.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.712/runtime/doc/eval.txt 2012-10-21 00:44:59.000000000 +0200
|
||||||
|
--- runtime/doc/eval.txt 2012-11-14 18:00:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4427,4432 ****
|
||||||
|
--- 4451,4457 ----
|
||||||
|
|
||||||
|
Often used items are:
|
||||||
|
%s string
|
||||||
|
+ %6S string right-aligned in 6 display cells
|
||||||
|
%6s string right-aligned in 6 bytes
|
||||||
|
%.9s string truncated to 9 bytes
|
||||||
|
%c single byte
|
||||||
|
***************
|
||||||
|
*** 4541,4546 ****
|
||||||
|
--- 4566,4575 ----
|
||||||
|
s The text of the String argument is used. If a
|
||||||
|
precision is specified, no more bytes than the number
|
||||||
|
specified are used.
|
||||||
|
+ S The text of the String argument is used. If a
|
||||||
|
+ precision is specified, no more display cells than the
|
||||||
|
+ number specified are used. Without the |+multi_byte|
|
||||||
|
+ feature works just like 's'.
|
||||||
|
|
||||||
|
*printf-f* *E807*
|
||||||
|
f The Float argument is converted into a string of the
|
||||||
|
*** ../vim-7.3.712/src/message.c 2012-03-28 16:49:25.000000000 +0200
|
||||||
|
--- src/message.c 2012-11-14 17:58:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4290,4295 ****
|
||||||
|
--- 4290,4296 ----
|
||||||
|
case '%':
|
||||||
|
case 'c':
|
||||||
|
case 's':
|
||||||
|
+ case 'S':
|
||||||
|
length_modifier = '\0';
|
||||||
|
str_arg_l = 1;
|
||||||
|
switch (fmt_spec)
|
||||||
|
***************
|
||||||
|
*** 4318,4323 ****
|
||||||
|
--- 4319,4325 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
case 's':
|
||||||
|
+ case 'S':
|
||||||
|
str_arg =
|
||||||
|
#ifndef HAVE_STDARG_H
|
||||||
|
(char *)get_a_arg(arg_idx);
|
||||||
|
***************
|
||||||
|
*** 4354,4359 ****
|
||||||
|
--- 4356,4379 ----
|
||||||
|
str_arg_l = (q == NULL) ? precision
|
||||||
|
: (size_t)(q - str_arg);
|
||||||
|
}
|
||||||
|
+ #ifdef FEAT_MBYTE
|
||||||
|
+ if (fmt_spec == 'S')
|
||||||
|
+ {
|
||||||
|
+ if (min_field_width != 0)
|
||||||
|
+ min_field_width += STRLEN(str_arg)
|
||||||
|
+ - mb_string2cells((char_u *)str_arg, -1);
|
||||||
|
+ if (precision)
|
||||||
|
+ {
|
||||||
|
+ char_u *p1 = (char_u *)str_arg;
|
||||||
|
+ size_t i;
|
||||||
|
+
|
||||||
|
+ for (i = 0; i < precision && *p1; i++)
|
||||||
|
+ p1 += mb_ptr2len(p1);
|
||||||
|
+
|
||||||
|
+ str_arg_l = precision = p1 - (char_u *)str_arg;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ #endif
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
*** ../vim-7.3.712/src/version.c 2012-10-23 05:35:30.000000000 +0200
|
||||||
|
--- src/version.c 2012-11-14 17:54:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 713,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
In many of the more relaxed civilizations on the Outer Eastern Rim of the
|
||||||
|
Galaxy, "The Hitchhiker's Guide to the Galaxy" has already supplanted the
|
||||||
|
great "Encyclopedia Galactica" as the standard repository of all knowledge
|
||||||
|
and wisdom, for though it has many omissions and contains much that is
|
||||||
|
apocryphal, or at least wildly inaccurate, it scores over the older, more
|
||||||
|
pedestrian work in two important respects.
|
||||||
|
First, it is slightly cheaper; and second, it has the words "DON'T PANIC"
|
||||||
|
inscribed in large friendly letters on its cover.
|
||||||
|
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
62
7.3.714
Normal file
62
7.3.714
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.714
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.714
|
||||||
|
Problem: Inconsistency: :set can be used in the sandbox, but :setlocal and
|
||||||
|
:setglobal cannot. (Michael Henry)
|
||||||
|
Solution: Fix the flags for :setlocal and :setglobal. (Christian Brabandt)
|
||||||
|
Files: src/ex_cmds.h
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.713/src/ex_cmds.h 2012-08-08 17:31:36.000000000 +0200
|
||||||
|
--- src/ex_cmds.h 2012-11-14 20:41:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 832,840 ****
|
||||||
|
EX(CMD_setfiletype, "setfiletype", ex_setfiletype,
|
||||||
|
TRLBAR|EXTRA|NEEDARG|CMDWIN),
|
||||||
|
EX(CMD_setglobal, "setglobal", ex_set,
|
||||||
|
! TRLBAR|EXTRA|CMDWIN),
|
||||||
|
EX(CMD_setlocal, "setlocal", ex_set,
|
||||||
|
! TRLBAR|EXTRA|CMDWIN),
|
||||||
|
EX(CMD_sfind, "sfind", ex_splitview,
|
||||||
|
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
|
||||||
|
EX(CMD_sfirst, "sfirst", ex_rewind,
|
||||||
|
--- 832,840 ----
|
||||||
|
EX(CMD_setfiletype, "setfiletype", ex_setfiletype,
|
||||||
|
TRLBAR|EXTRA|NEEDARG|CMDWIN),
|
||||||
|
EX(CMD_setglobal, "setglobal", ex_set,
|
||||||
|
! TRLBAR|EXTRA|CMDWIN|SBOXOK),
|
||||||
|
EX(CMD_setlocal, "setlocal", ex_set,
|
||||||
|
! TRLBAR|EXTRA|CMDWIN|SBOXOK),
|
||||||
|
EX(CMD_sfind, "sfind", ex_splitview,
|
||||||
|
BANG|FILE1|RANGE|NOTADR|EDITCMD|ARGOPT|TRLBAR),
|
||||||
|
EX(CMD_sfirst, "sfirst", ex_rewind,
|
||||||
|
*** ../vim-7.3.713/src/version.c 2012-11-14 18:10:49.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-14 20:43:01.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 714,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
"So this is it," said Arthur, "we are going to die."
|
||||||
|
"Yes," said Ford, "except...no! Wait a minute!" He suddenly lunged across
|
||||||
|
the chamber at something behind Arthur's line of vision. "What's this
|
||||||
|
switch?" he cried.
|
||||||
|
"What? Where?" cried Arthur, twisting around.
|
||||||
|
"No, I was only fooling," said Ford, "we are going to die after all."
|
||||||
|
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
234
7.3.715
Normal file
234
7.3.715
Normal file
@ -0,0 +1,234 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.715
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.715
|
||||||
|
Problem: Crash when calling setloclist() in BufUnload autocmd. (Marcin
|
||||||
|
Szamotulski)
|
||||||
|
Solution: Set w_llist to NULL when it was freed. Also add a test.
|
||||||
|
(Christian Brabandt)
|
||||||
|
Files: src/quickfix.c, src/testdir/test49.ok, src/testdir/test49.vim
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.714/src/quickfix.c 2012-06-29 12:57:03.000000000 +0200
|
||||||
|
--- src/quickfix.c 2012-11-14 22:33:20.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 107,113 ****
|
||||||
|
};
|
||||||
|
|
||||||
|
static int qf_init_ext __ARGS((qf_info_T *qi, char_u *efile, buf_T *buf, typval_T *tv, char_u *errorformat, int newlist, linenr_T lnumfirst, linenr_T lnumlast, char_u *qf_title));
|
||||||
|
! static void qf_new_list __ARGS((qf_info_T *qi, char_u *qf_title));
|
||||||
|
static void ll_free_all __ARGS((qf_info_T **pqi));
|
||||||
|
static int qf_add_entry __ARGS((qf_info_T *qi, qfline_T **prevp, char_u *dir, char_u *fname, int bufnum, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid));
|
||||||
|
static qf_info_T *ll_new_list __ARGS((void));
|
||||||
|
--- 107,113 ----
|
||||||
|
};
|
||||||
|
|
||||||
|
static int qf_init_ext __ARGS((qf_info_T *qi, char_u *efile, buf_T *buf, typval_T *tv, char_u *errorformat, int newlist, linenr_T lnumfirst, linenr_T lnumlast, char_u *qf_title));
|
||||||
|
! static void qf_new_list __ARGS((qf_info_T *qi, char_u *qf_title, win_T *wp));
|
||||||
|
static void ll_free_all __ARGS((qf_info_T **pqi));
|
||||||
|
static int qf_add_entry __ARGS((qf_info_T *qi, qfline_T **prevp, char_u *dir, char_u *fname, int bufnum, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid));
|
||||||
|
static qf_info_T *ll_new_list __ARGS((void));
|
||||||
|
***************
|
||||||
|
*** 266,272 ****
|
||||||
|
|
||||||
|
if (newlist || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, qf_title);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (qfprev = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
--- 266,272 ----
|
||||||
|
|
||||||
|
if (newlist || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, qf_title, curwin);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (qfprev = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
***************
|
||||||
|
*** 885,893 ****
|
||||||
|
* Prepare for adding a new quickfix list.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
! qf_new_list(qi, qf_title)
|
||||||
|
qf_info_T *qi;
|
||||||
|
char_u *qf_title;
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
--- 885,894 ----
|
||||||
|
* Prepare for adding a new quickfix list.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
! qf_new_list(qi, qf_title, wp)
|
||||||
|
qf_info_T *qi;
|
||||||
|
char_u *qf_title;
|
||||||
|
+ win_T *wp;
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 897,903 ****
|
||||||
|
--- 898,908 ----
|
||||||
|
* way with ":grep'.
|
||||||
|
*/
|
||||||
|
while (qi->qf_listcount > qi->qf_curlist + 1)
|
||||||
|
+ {
|
||||||
|
+ if (wp != NULL && wp->w_llist == qi)
|
||||||
|
+ wp->w_llist = NULL;
|
||||||
|
qf_free(qi, --qi->qf_listcount);
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When the stack is full, remove to oldest entry
|
||||||
|
***************
|
||||||
|
*** 905,910 ****
|
||||||
|
--- 910,917 ----
|
||||||
|
*/
|
||||||
|
if (qi->qf_listcount == LISTCOUNT)
|
||||||
|
{
|
||||||
|
+ if (wp != NULL && wp->w_llist == qi)
|
||||||
|
+ wp->w_llist = NULL;
|
||||||
|
qf_free(qi, 0);
|
||||||
|
for (i = 1; i < LISTCOUNT; ++i)
|
||||||
|
qi->qf_lists[i - 1] = qi->qf_lists[i];
|
||||||
|
***************
|
||||||
|
*** 3181,3187 ****
|
||||||
|
eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
|
||||||
|
|| qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
--- 3188,3194 ----
|
||||||
|
eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
|
||||||
|
|| qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep, curwin);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
***************
|
||||||
|
*** 3747,3753 ****
|
||||||
|
|
||||||
|
if (action == ' ' || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, title);
|
||||||
|
else if (action == 'a' && qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
--- 3754,3760 ----
|
||||||
|
|
||||||
|
if (action == ' ' || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, title, wp);
|
||||||
|
else if (action == 'a' && qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
***************
|
||||||
|
*** 4029,4035 ****
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* create a new quickfix list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep);
|
||||||
|
|
||||||
|
/* Go through all directories in 'runtimepath' */
|
||||||
|
p = p_rtp;
|
||||||
|
--- 4036,4042 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* create a new quickfix list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep, wp);
|
||||||
|
|
||||||
|
/* Go through all directories in 'runtimepath' */
|
||||||
|
p = p_rtp;
|
||||||
|
*** ../vim-7.3.714/src/testdir/test49.ok 2010-08-15 21:57:29.000000000 +0200
|
||||||
|
--- src/testdir/test49.ok 2012-11-14 22:26:13.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 85,92 ****
|
||||||
|
*** Test 83: OK (2835)
|
||||||
|
*** Test 84: OK (934782101)
|
||||||
|
*** Test 85: OK (198689)
|
||||||
|
! --- Test 86: All tests were run with throwing exceptions on error.
|
||||||
|
The $VIMNOERRTHROW control is not configured.
|
||||||
|
! --- Test 86: All tests were run with throwing exceptions on interrupt.
|
||||||
|
The $VIMNOINTTHROW control is not configured.
|
||||||
|
! *** Test 86: OK (50443995)
|
||||||
|
--- 85,94 ----
|
||||||
|
*** Test 83: OK (2835)
|
||||||
|
*** Test 84: OK (934782101)
|
||||||
|
*** Test 85: OK (198689)
|
||||||
|
! --- Test 86: No Crash for vimgrep on BufUnload
|
||||||
|
! *** Test 86: OK (0)
|
||||||
|
! --- Test 87: All tests were run with throwing exceptions on error.
|
||||||
|
The $VIMNOERRTHROW control is not configured.
|
||||||
|
! --- Test 87: All tests were run with throwing exceptions on interrupt.
|
||||||
|
The $VIMNOINTTHROW control is not configured.
|
||||||
|
! *** Test 87: OK (50443995)
|
||||||
|
*** ../vim-7.3.714/src/testdir/test49.vim 2010-09-29 16:55:45.000000000 +0200
|
||||||
|
--- src/testdir/test49.vim 2012-11-14 22:26:13.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 9603,9611 ****
|
||||||
|
|
||||||
|
Xcheck 198689
|
||||||
|
|
||||||
|
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
! " Test 86: $VIMNOERRTHROW and $VIMNOINTTHROW support {{{1
|
||||||
|
"
|
||||||
|
" It is possible to configure Vim for throwing exceptions on error
|
||||||
|
" or interrupt, controlled by variables $VIMNOERRTHROW and
|
||||||
|
--- 9603,9630 ----
|
||||||
|
|
||||||
|
Xcheck 198689
|
||||||
|
|
||||||
|
+ "-------------------------------------------------------------------------------
|
||||||
|
+ " Test 86 setloclist crash {{{1
|
||||||
|
+ "
|
||||||
|
+ " Executing a setloclist() on BufUnload shouldn't crash Vim
|
||||||
|
+ "-------------------------------------------------------------------------------
|
||||||
|
+
|
||||||
|
+ func F
|
||||||
|
+ au BufUnload * :call setloclist(0, [{'bufnr':1, 'lnum':1, 'col':1, 'text': 'tango down'}])
|
||||||
|
+
|
||||||
|
+ :lvimgrep /.*/ *
|
||||||
|
+ endfunc
|
||||||
|
+
|
||||||
|
+ XpathINIT
|
||||||
|
+
|
||||||
|
+ ExecAsScript F
|
||||||
|
+
|
||||||
|
+ delfunction F
|
||||||
|
+ Xout "No Crash for vimgrep on BufUnload"
|
||||||
|
+ Xcheck 0
|
||||||
|
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
! " Test 87: $VIMNOERRTHROW and $VIMNOINTTHROW support {{{1
|
||||||
|
"
|
||||||
|
" It is possible to configure Vim for throwing exceptions on error
|
||||||
|
" or interrupt, controlled by variables $VIMNOERRTHROW and
|
||||||
|
*** ../vim-7.3.714/src/version.c 2012-11-14 20:52:22.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-14 22:36:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 715,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
One difference between a man and a machine is that a machine is quiet
|
||||||
|
when well oiled.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
70
7.3.716
Normal file
70
7.3.716
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.716
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.716
|
||||||
|
Problem: Error on exit when using Python 3.
|
||||||
|
Solution: Remove PythonIO_Fini(). (Roland Puntaier)
|
||||||
|
Files: src/if_python3.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.715/src/if_python3.c 2012-10-23 05:17:33.000000000 +0200
|
||||||
|
--- src/if_python3.c 2012-11-20 10:59:54.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 657,663 ****
|
||||||
|
static PyObject *globals;
|
||||||
|
|
||||||
|
static int PythonIO_Init(void);
|
||||||
|
- static void PythonIO_Fini(void);
|
||||||
|
PyMODINIT_FUNC Py3Init_vim(void);
|
||||||
|
|
||||||
|
/******************************************************
|
||||||
|
--- 657,662 ----
|
||||||
|
***************
|
||||||
|
*** 685,691 ****
|
||||||
|
// acquire lock before finalizing
|
||||||
|
pygilstate = PyGILState_Ensure();
|
||||||
|
|
||||||
|
- PythonIO_Fini();
|
||||||
|
Py_Finalize();
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 684,689 ----
|
||||||
|
***************
|
||||||
|
*** 989,1001 ****
|
||||||
|
return PythonIO_Init_io();
|
||||||
|
}
|
||||||
|
|
||||||
|
- static void
|
||||||
|
- PythonIO_Fini(void)
|
||||||
|
- {
|
||||||
|
- PySys_SetObject("stdout", NULL);
|
||||||
|
- PySys_SetObject("stderr", NULL);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
/******************************************************
|
||||||
|
* 3. Implementation of the Vim module for Python
|
||||||
|
*/
|
||||||
|
--- 987,992 ----
|
||||||
|
*** ../vim-7.3.715/src/version.c 2012-11-14 22:38:04.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-15 21:40:47.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 716,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Nothing is fool-proof to a sufficiently talented fool.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
59
7.3.717
Normal file
59
7.3.717
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.717
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.717
|
||||||
|
Problem: When changing the font size, only MS-Windows limits the window
|
||||||
|
size.
|
||||||
|
Solution: Also limit the window size on other systems. (Roland Puntaier)
|
||||||
|
Files: src/gui.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.716/src/gui.c 2012-08-29 16:34:23.000000000 +0200
|
||||||
|
--- src/gui.c 2012-11-20 12:01:08.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 905,917 ****
|
||||||
|
# endif
|
||||||
|
gui_mch_set_font(gui.norm_font);
|
||||||
|
#endif
|
||||||
|
! gui_set_shellsize(FALSE,
|
||||||
|
! #ifdef MSWIN
|
||||||
|
! TRUE
|
||||||
|
! #else
|
||||||
|
! FALSE
|
||||||
|
! #endif
|
||||||
|
! , RESIZE_BOTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
--- 905,911 ----
|
||||||
|
# endif
|
||||||
|
gui_mch_set_font(gui.norm_font);
|
||||||
|
#endif
|
||||||
|
! gui_set_shellsize(FALSE, TRUE, RESIZE_BOTH);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
*** ../vim-7.3.716/src/version.c 2012-11-20 11:02:49.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 12:02:04.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 717,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
The 50-50-90 rule: Anytime you have a 50-50 chance of getting
|
||||||
|
something right, there's a 90% probability you'll get it wrong.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
49
7.3.718
Normal file
49
7.3.718
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.718
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.718
|
||||||
|
Problem: When re-using the current buffer the buffer-local options stay.
|
||||||
|
Solution: Re-initialize the buffer-local options. (Christian Brabandt)
|
||||||
|
Files: src/buffer.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.717/src/buffer.c 2012-10-03 18:24:55.000000000 +0200
|
||||||
|
--- src/buffer.c 2012-11-17 14:11:35.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1702,1707 ****
|
||||||
|
--- 1702,1712 ----
|
||||||
|
#endif
|
||||||
|
/* buf->b_nwindows = 0; why was this here? */
|
||||||
|
free_buffer_stuff(buf, FALSE); /* delete local variables et al. */
|
||||||
|
+
|
||||||
|
+ /* Init the options. */
|
||||||
|
+ buf->b_p_initialized = FALSE;
|
||||||
|
+ buf_copy_options(buf, BCO_ENTER);
|
||||||
|
+
|
||||||
|
#ifdef FEAT_KEYMAP
|
||||||
|
/* need to reload lmaps and set b:keymap_name */
|
||||||
|
curbuf->b_kmap_state |= KEYMAP_INIT;
|
||||||
|
*** ../vim-7.3.717/src/version.c 2012-11-20 12:03:02.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 12:16:35.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 718,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Latest survey shows that 3 out of 4 people make up 75% of the
|
||||||
|
world's population.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
849
7.3.719
Normal file
849
7.3.719
Normal file
@ -0,0 +1,849 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.719
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.719
|
||||||
|
Problem: Cannot run new version of cproto, it fails on missing include
|
||||||
|
files.
|
||||||
|
Solution: Add lots of #ifndef PROTO
|
||||||
|
Files: src/os_amiga.c, src/os_amiga.h, src/gui_w16.c, src/gui_w48.c,
|
||||||
|
src/gui_w32.c, src/vimio.h, src/os_msdos.c, src/os_msdos.h,
|
||||||
|
src/os_win16.h, src/os_win16.c, src/os_win32.h, src/os_win32.c,
|
||||||
|
src/os_mswin.c, src/gui_photon.c, src/os_unix.h, src/os_beos.c,
|
||||||
|
src/os_beos.h
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.718/src/os_amiga.c 2012-06-29 15:51:26.000000000 +0200
|
||||||
|
--- src/os_amiga.c 2012-11-20 15:47:31.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 22,27 ****
|
||||||
|
--- 22,30 ----
|
||||||
|
#undef TRUE /* will be redefined by exec/types.h */
|
||||||
|
#undef FALSE
|
||||||
|
|
||||||
|
+ /* cproto fails on missing include files, skip them */
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
#ifndef LATTICE
|
||||||
|
# include <exec/types.h>
|
||||||
|
# include <exec/exec.h>
|
||||||
|
***************
|
||||||
|
*** 55,60 ****
|
||||||
|
--- 58,65 ----
|
||||||
|
# include <libraries/arp_pragmas.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* At this point TRUE and FALSE are defined as 1L and 0L, but we want 1 and 0.
|
||||||
|
*/
|
||||||
|
***************
|
||||||
|
*** 283,289 ****
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
! #include <workbench/startup.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check_win checks whether we have an interactive window.
|
||||||
|
--- 288,296 ----
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <workbench/startup.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Check_win checks whether we have an interactive window.
|
||||||
|
***************
|
||||||
|
*** 1002,1008 ****
|
||||||
|
* Heavely modified by mool.
|
||||||
|
*/
|
||||||
|
|
||||||
|
! #include <devices/conunit.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* try to get the real window size
|
||||||
|
--- 1009,1017 ----
|
||||||
|
* Heavely modified by mool.
|
||||||
|
*/
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <devices/conunit.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* try to get the real window size
|
||||||
|
***************
|
||||||
|
*** 1129,1137 ****
|
||||||
|
* say 'oml lib:amiga.lib -r sendpacket.o'
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* #include <proto/exec.h> */
|
||||||
|
/* #include <proto/dos.h> */
|
||||||
|
! #include <exec/memory.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function - dos_packet written by Phil Lindsay, Carolyn Scheppner, and Andy
|
||||||
|
--- 1138,1148 ----
|
||||||
|
* say 'oml lib:amiga.lib -r sendpacket.o'
|
||||||
|
*/
|
||||||
|
|
||||||
|
+ #ifndef PROTO
|
||||||
|
/* #include <proto/exec.h> */
|
||||||
|
/* #include <proto/dos.h> */
|
||||||
|
! # include <exec/memory.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Function - dos_packet written by Phil Lindsay, Carolyn Scheppner, and Andy
|
||||||
|
*** ../vim-7.3.718/src/os_amiga.h 2010-08-15 21:57:25.000000000 +0200
|
||||||
|
--- src/os_amiga.h 2012-11-20 15:46:37.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 56,61 ****
|
||||||
|
--- 56,64 ----
|
||||||
|
# define TEMPNAMELEN 12
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ /* cproto fails on missing include files */
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
#include <exec/types.h>
|
||||||
|
#include <libraries/dos.h>
|
||||||
|
#include <libraries/dosextens.h>
|
||||||
|
***************
|
||||||
|
*** 67,72 ****
|
||||||
|
--- 70,77 ----
|
||||||
|
# include <proto/intuition.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
#define FNAME_ILLEGAL ";*?`#%" /* illegal characters in a file name */
|
||||||
|
|
||||||
|
/*
|
||||||
|
***************
|
||||||
|
*** 85,90 ****
|
||||||
|
--- 90,96 ----
|
||||||
|
# include <unistd.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #ifndef PROTO
|
||||||
|
/*
|
||||||
|
* arpbase.h must be included before functions.h
|
||||||
|
*/
|
||||||
|
***************
|
||||||
|
*** 92,97 ****
|
||||||
|
--- 98,105 ----
|
||||||
|
# include <libraries/arpbase.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* This won't be needed if you have a version of Lattice 4.01 without broken
|
||||||
|
* break signal handling.
|
||||||
|
*** ../vim-7.3.718/src/gui_w16.c 2012-02-04 22:01:44.000000000 +0100
|
||||||
|
--- src/gui_w16.c 2012-11-20 15:55:04.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1521,1527 ****
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(FEAT_TOOLBAR) || defined(PROTO)
|
||||||
|
! #include "gui_w3~1.h"
|
||||||
|
/*
|
||||||
|
* Create the toolbar, initially unpopulated.
|
||||||
|
* (just like the menu, there are no defaults, it's all
|
||||||
|
--- 1521,1532 ----
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(FEAT_TOOLBAR) || defined(PROTO)
|
||||||
|
!
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include "gui_w3~1.h"
|
||||||
|
! #endif
|
||||||
|
!
|
||||||
|
/*
|
||||||
|
* Create the toolbar, initially unpopulated.
|
||||||
|
* (just like the menu, there are no defaults, it's all
|
||||||
|
*** ../vim-7.3.718/src/gui_w48.c 2012-01-20 20:54:15.000000000 +0100
|
||||||
|
--- src/gui_w48.c 2012-11-20 15:53:49.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 25,30 ****
|
||||||
|
--- 25,34 ----
|
||||||
|
#ifdef DEBUG
|
||||||
|
# include <tchar.h>
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+ /* cproto fails on missing include files */
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
#ifndef __MINGW32__
|
||||||
|
# include <shellapi.h>
|
||||||
|
#endif
|
||||||
|
***************
|
||||||
|
*** 44,49 ****
|
||||||
|
--- 48,55 ----
|
||||||
|
# include "glbl_ime.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
#ifdef FEAT_MENU
|
||||||
|
# define MENUHINTS /* show menu hints in command line */
|
||||||
|
#endif
|
||||||
|
*** ../vim-7.3.718/src/gui_w32.c 2012-01-04 20:29:18.000000000 +0100
|
||||||
|
--- src/gui_w32.c 2012-11-20 15:56:31.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 198,208 ****
|
||||||
|
static UINT_PTR BevalTimerId = 0;
|
||||||
|
static DWORD LastActivity = 0;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* excerpts from headers since this may not be presented
|
||||||
|
* in the extremely old compilers
|
||||||
|
*/
|
||||||
|
! #include <pshpack1.h>
|
||||||
|
|
||||||
|
typedef struct _DllVersionInfo
|
||||||
|
{
|
||||||
|
--- 198,214 ----
|
||||||
|
static UINT_PTR BevalTimerId = 0;
|
||||||
|
static DWORD LastActivity = 0;
|
||||||
|
|
||||||
|
+
|
||||||
|
+ /* cproto fails on missing include files */
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* excerpts from headers since this may not be presented
|
||||||
|
* in the extremely old compilers
|
||||||
|
*/
|
||||||
|
! # include <pshpack1.h>
|
||||||
|
!
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
typedef struct _DllVersionInfo
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 213,219 ****
|
||||||
|
DWORD dwPlatformID;
|
||||||
|
} DLLVERSIONINFO;
|
||||||
|
|
||||||
|
! #include <poppack.h>
|
||||||
|
|
||||||
|
typedef struct tagTOOLINFOA_NEW
|
||||||
|
{
|
||||||
|
--- 219,227 ----
|
||||||
|
DWORD dwPlatformID;
|
||||||
|
} DLLVERSIONINFO;
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <poppack.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
typedef struct tagTOOLINFOA_NEW
|
||||||
|
{
|
||||||
|
*** ../vim-7.3.718/src/vimio.h 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/vimio.h 2012-11-20 15:57:19.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 13,16 ****
|
||||||
|
# define _CRT_NONSTDC_NO_DEPRECATE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #include <io.h>
|
||||||
|
--- 13,19 ----
|
||||||
|
# define _CRT_NONSTDC_NO_DEPRECATE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <io.h>
|
||||||
|
! #endif
|
||||||
|
*** ../vim-7.3.718/src/os_msdos.c 2012-06-29 15:51:26.000000000 +0200
|
||||||
|
--- src/os_msdos.c 2012-11-20 15:59:18.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 23,29 ****
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
! #include <conio.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* MS-DOS only code, not used for Win16.
|
||||||
|
--- 23,32 ----
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <conio.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* MS-DOS only code, not used for Win16.
|
||||||
|
***************
|
||||||
|
*** 31,47 ****
|
||||||
|
#ifndef WIN16
|
||||||
|
|
||||||
|
|
||||||
|
! #include <bios.h>
|
||||||
|
! #ifdef DJGPP
|
||||||
|
! # include <dpmi.h>
|
||||||
|
! # include <signal.h>
|
||||||
|
! # include <sys/movedata.h>
|
||||||
|
! # include <crt0.h>
|
||||||
|
! # ifdef FEAT_CLIPBOARD
|
||||||
|
! # include <sys/segments.h>
|
||||||
|
# endif
|
||||||
|
- #else
|
||||||
|
- # include <alloc.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(DJGPP) || defined(PROTO)
|
||||||
|
--- 34,52 ----
|
||||||
|
#ifndef WIN16
|
||||||
|
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <bios.h>
|
||||||
|
! # ifdef DJGPP
|
||||||
|
! # include <dpmi.h>
|
||||||
|
! # include <signal.h>
|
||||||
|
! # include <sys/movedata.h>
|
||||||
|
! # include <crt0.h>
|
||||||
|
! # ifdef FEAT_CLIPBOARD
|
||||||
|
! # include <sys/segments.h>
|
||||||
|
! # endif
|
||||||
|
! # else
|
||||||
|
! # include <alloc.h>
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(DJGPP) || defined(PROTO)
|
||||||
|
***************
|
||||||
|
*** 2130,2137 ****
|
||||||
|
|
||||||
|
#undef setlocale
|
||||||
|
|
||||||
|
! #include <go32.h>
|
||||||
|
! #include <inlines/ctype.ha>
|
||||||
|
#include <locale.h>
|
||||||
|
|
||||||
|
#define UPCASE (__dj_ISALNUM | __dj_ISALPHA | __dj_ISGRAPH | __dj_ISPRINT | __dj_ISUPPER)
|
||||||
|
--- 2135,2144 ----
|
||||||
|
|
||||||
|
#undef setlocale
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <go32.h>
|
||||||
|
! # include <inlines/ctype.ha>
|
||||||
|
! #endif
|
||||||
|
#include <locale.h>
|
||||||
|
|
||||||
|
#define UPCASE (__dj_ISALNUM | __dj_ISALPHA | __dj_ISGRAPH | __dj_ISPRINT | __dj_ISUPPER)
|
||||||
|
*** ../vim-7.3.718/src/os_msdos.h 2010-08-15 21:57:25.000000000 +0200
|
||||||
|
--- src/os_msdos.h 2012-11-20 15:57:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 53,61 ****
|
||||||
|
|
||||||
|
#define FNAME_ILLEGAL "\"*?><|" /* illegal characters in a file name */
|
||||||
|
|
||||||
|
! #include <dos.h>
|
||||||
|
! #include <dir.h>
|
||||||
|
! #include <time.h>
|
||||||
|
|
||||||
|
#ifdef DJGPP
|
||||||
|
# include <unistd.h>
|
||||||
|
--- 53,64 ----
|
||||||
|
|
||||||
|
#define FNAME_ILLEGAL "\"*?><|" /* illegal characters in a file name */
|
||||||
|
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <dos.h>
|
||||||
|
! # include <dir.h>
|
||||||
|
! # include <time.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
#ifdef DJGPP
|
||||||
|
# include <unistd.h>
|
||||||
|
*** ../vim-7.3.718/src/os_win16.h 2010-08-15 21:57:25.000000000 +0200
|
||||||
|
--- src/os_win16.h 2012-11-20 16:00:33.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 63,78 ****
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <time.h>
|
||||||
|
- #include <dos.h>
|
||||||
|
- #include <dir.h>
|
||||||
|
|
||||||
|
! #ifndef STRICT
|
||||||
|
! # define STRICT
|
||||||
|
! #endif
|
||||||
|
! #ifndef COBJMACROS
|
||||||
|
! # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */
|
||||||
|
! #endif
|
||||||
|
! #include <windows.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* plenty of memory, use large buffers
|
||||||
|
--- 63,83 ----
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <dos.h>
|
||||||
|
! # include <dir.h>
|
||||||
|
!
|
||||||
|
! # ifndef STRICT
|
||||||
|
! # define STRICT
|
||||||
|
! # endif
|
||||||
|
! # ifndef COBJMACROS
|
||||||
|
! # define COBJMACROS /* For OLE: Enable "friendlier" access to objects */
|
||||||
|
! # endif
|
||||||
|
! # include <windows.h>
|
||||||
|
!
|
||||||
|
! #endif /* PROTO */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* plenty of memory, use large buffers
|
||||||
|
*** ../vim-7.3.718/src/os_win16.c 2012-06-29 15:51:26.000000000 +0200
|
||||||
|
--- src/os_win16.c 2012-11-20 16:01:50.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 22,37 ****
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
! #include <dos.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <limits.h>
|
||||||
|
- #include <process.h>
|
||||||
|
|
||||||
|
! #undef chdir
|
||||||
|
! #include <direct.h>
|
||||||
|
! #include <shellapi.h> /* required for FindExecutable() */
|
||||||
|
|
||||||
|
|
||||||
|
/* Record all output and all keyboard & mouse input */
|
||||||
|
--- 22,44 ----
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <dos.h>
|
||||||
|
! #endif
|
||||||
|
!
|
||||||
|
#include <string.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <limits.h>
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <process.h>
|
||||||
|
!
|
||||||
|
! # undef chdir
|
||||||
|
! # include <direct.h>
|
||||||
|
! # include <shellapi.h> /* required for FindExecutable() */
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
|
||||||
|
/* Record all output and all keyboard & mouse input */
|
||||||
|
*** ../vim-7.3.718/src/os_win32.h 2012-10-21 21:38:42.000000000 +0200
|
||||||
|
--- src/os_win32.h 2012-11-20 16:09:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 12,18 ****
|
||||||
|
|
||||||
|
#include "os_dos.h" /* common MS-DOS and Win32 stuff */
|
||||||
|
#ifndef __CYGWIN__
|
||||||
|
! #include <direct.h> /* for _mkdir() */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Stop the VC2005 compiler from nagging. */
|
||||||
|
--- 12,21 ----
|
||||||
|
|
||||||
|
#include "os_dos.h" /* common MS-DOS and Win32 stuff */
|
||||||
|
#ifndef __CYGWIN__
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! # ifndef PROTO
|
||||||
|
! # include <direct.h> /* for _mkdir() */
|
||||||
|
! # endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Stop the VC2005 compiler from nagging. */
|
||||||
|
***************
|
||||||
|
*** 101,107 ****
|
||||||
|
#ifndef COBJMACROS
|
||||||
|
# define COBJMACROS /* For OLE: Enable "friendlier" access to objects */
|
||||||
|
#endif
|
||||||
|
! #include <windows.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Win32 has plenty of memory, use large buffers
|
||||||
|
--- 104,112 ----
|
||||||
|
#ifndef COBJMACROS
|
||||||
|
# define COBJMACROS /* For OLE: Enable "friendlier" access to objects */
|
||||||
|
#endif
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <windows.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Win32 has plenty of memory, use large buffers
|
||||||
|
***************
|
||||||
|
*** 194,199 ****
|
||||||
|
--- 199,206 ----
|
||||||
|
# define vim_mkdir(x, y) mch_mkdir(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
/* Enable common dialogs input unicode from IME if posible. */
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
/* The variables are defined in os_win32.c. */
|
||||||
|
***************
|
||||||
|
*** 207,209 ****
|
||||||
|
--- 214,218 ----
|
||||||
|
# define pIsDialogMessage IsDialogMessage
|
||||||
|
# define pPeekMessage PeekMessage
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
*** ../vim-7.3.718/src/os_win32.c 2012-10-21 21:38:42.000000000 +0200
|
||||||
|
--- src/os_win32.c 2012-11-20 16:12:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 29,35 ****
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <limits.h>
|
||||||
|
! #include <process.h>
|
||||||
|
|
||||||
|
#undef chdir
|
||||||
|
#ifdef __GNUC__
|
||||||
|
--- 29,39 ----
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <limits.h>
|
||||||
|
!
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <process.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
#undef chdir
|
||||||
|
#ifdef __GNUC__
|
||||||
|
***************
|
||||||
|
*** 40,47 ****
|
||||||
|
# include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32)
|
||||||
|
! # include <shellapi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
--- 44,53 ----
|
||||||
|
# include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32)
|
||||||
|
! # include <shellapi.h>
|
||||||
|
! # endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
***************
|
||||||
|
*** 125,130 ****
|
||||||
|
--- 131,137 ----
|
||||||
|
typedef int WORD;
|
||||||
|
typedef int WCHAR;
|
||||||
|
typedef void VOID;
|
||||||
|
+ typedef int BY_HANDLE_FILE_INFORMATION;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef FEAT_GUI_W32
|
||||||
|
***************
|
||||||
|
*** 152,157 ****
|
||||||
|
--- 159,166 ----
|
||||||
|
# define wcsicmp(a, b) wcscmpi((a), (b))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
/* Enable common dialogs input unicode from IME if posible. */
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
LRESULT (WINAPI *pDispatchMessage)(LPMSG) = DispatchMessage;
|
||||||
|
***************
|
||||||
|
*** 160,165 ****
|
||||||
|
--- 169,176 ----
|
||||||
|
BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT) = PeekMessage;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
#ifndef FEAT_GUI_W32
|
||||||
|
/* Win32 Console handles for input and output */
|
||||||
|
static HANDLE g_hConIn = INVALID_HANDLE_VALUE;
|
||||||
|
***************
|
||||||
|
*** 453,459 ****
|
||||||
|
DWORD g_PlatformId;
|
||||||
|
|
||||||
|
#ifdef HAVE_ACL
|
||||||
|
! # include <aclapi.h>
|
||||||
|
/*
|
||||||
|
* These are needed to dynamically load the ADVAPI DLL, which is not
|
||||||
|
* implemented under Windows 95 (and causes VIM to crash)
|
||||||
|
--- 464,473 ----
|
||||||
|
DWORD g_PlatformId;
|
||||||
|
|
||||||
|
#ifdef HAVE_ACL
|
||||||
|
! # ifndef PROTO
|
||||||
|
! # include <aclapi.h>
|
||||||
|
! # endif
|
||||||
|
!
|
||||||
|
/*
|
||||||
|
* These are needed to dynamically load the ADVAPI DLL, which is not
|
||||||
|
* implemented under Windows 95 (and causes VIM to crash)
|
||||||
|
***************
|
||||||
|
*** 1658,1665 ****
|
||||||
|
#endif /* FEAT_GUI_W32 */
|
||||||
|
}
|
||||||
|
|
||||||
|
! #ifndef __MINGW32__
|
||||||
|
! # include <shellapi.h> /* required for FindExecutable() */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- 1672,1681 ----
|
||||||
|
#endif /* FEAT_GUI_W32 */
|
||||||
|
}
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # ifndef __MINGW32__
|
||||||
|
! # include <shellapi.h> /* required for FindExecutable() */
|
||||||
|
! # endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
*** ../vim-7.3.718/src/os_mswin.c 2011-11-30 13:42:40.000000000 +0100
|
||||||
|
--- src/os_mswin.c 2012-11-20 16:15:05.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 26,38 ****
|
||||||
|
|
||||||
|
#ifdef WIN16
|
||||||
|
# define SHORT_FNAME /* always 8.3 file name */
|
||||||
|
! # include <dos.h>
|
||||||
|
# include <string.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <limits.h>
|
||||||
|
! #include <process.h>
|
||||||
|
|
||||||
|
#undef chdir
|
||||||
|
#ifdef __GNUC__
|
||||||
|
--- 26,43 ----
|
||||||
|
|
||||||
|
#ifdef WIN16
|
||||||
|
# define SHORT_FNAME /* always 8.3 file name */
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! # ifndef PROTO
|
||||||
|
! # include <dos.h>
|
||||||
|
! # endif
|
||||||
|
# include <string.h>
|
||||||
|
#endif
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <limits.h>
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <process.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
#undef chdir
|
||||||
|
#ifdef __GNUC__
|
||||||
|
***************
|
||||||
|
*** 43,62 ****
|
||||||
|
# include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32)
|
||||||
|
! # include <shellapi.h>
|
||||||
|
! #endif
|
||||||
|
!
|
||||||
|
! #if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT)
|
||||||
|
! # include <dlgs.h>
|
||||||
|
! # ifdef WIN3264
|
||||||
|
! # include <winspool.h>
|
||||||
|
! # else
|
||||||
|
! # include <print.h>
|
||||||
|
# endif
|
||||||
|
! # include <commdlg.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
# ifndef FROM_LEFT_1ST_BUTTON_PRESSED
|
||||||
|
# define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001
|
||||||
|
--- 48,70 ----
|
||||||
|
# include <direct.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # if defined(FEAT_TITLE) && !defined(FEAT_GUI_W32)
|
||||||
|
! # include <shellapi.h>
|
||||||
|
# endif
|
||||||
|
!
|
||||||
|
! # if defined(FEAT_PRINTER) && !defined(FEAT_POSTSCRIPT)
|
||||||
|
! # include <dlgs.h>
|
||||||
|
! # ifdef WIN3264
|
||||||
|
! # include <winspool.h>
|
||||||
|
! # else
|
||||||
|
! # include <print.h>
|
||||||
|
! # endif
|
||||||
|
! # include <commdlg.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
#ifdef __MINGW32__
|
||||||
|
# ifndef FROM_LEFT_1ST_BUTTON_PRESSED
|
||||||
|
# define FROM_LEFT_1ST_BUTTON_PRESSED 0x0001
|
||||||
|
***************
|
||||||
|
*** 2410,2416 ****
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(FEAT_SHORTCUT) || defined(PROTO)
|
||||||
|
! # include <shlobj.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When "fname" is the name of a shortcut (*.lnk) resolve the file it points
|
||||||
|
--- 2418,2426 ----
|
||||||
|
|
||||||
|
|
||||||
|
#if defined(FEAT_SHORTCUT) || defined(PROTO)
|
||||||
|
! # ifndef PROTO
|
||||||
|
! # include <shlobj.h>
|
||||||
|
! # endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When "fname" is the name of a shortcut (*.lnk) resolve the file it points
|
||||||
|
*** ../vim-7.3.718/src/gui_photon.c 2011-09-14 16:04:52.000000000 +0200
|
||||||
|
--- src/gui_photon.c 2012-11-20 16:16:11.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 13,20 ****
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
! #ifdef FEAT_TOOLBAR
|
||||||
|
! # include <photon/PxImage.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(__QNX__)
|
||||||
|
--- 13,23 ----
|
||||||
|
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
! /* cproto fails on missing include files */
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # ifdef FEAT_TOOLBAR
|
||||||
|
! # include <photon/PxImage.h>
|
||||||
|
! # endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(__QNX__)
|
||||||
|
*** ../vim-7.3.718/src/os_unix.h 2011-02-25 15:17:14.000000000 +0100
|
||||||
|
--- src/os_unix.h 2012-11-20 16:51:06.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 198,203 ****
|
||||||
|
--- 198,206 ----
|
||||||
|
# define HAVE_TOTAL_MEM
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+
|
||||||
|
+ #ifndef PROTO
|
||||||
|
+
|
||||||
|
#ifdef VMS
|
||||||
|
# include <unixio.h>
|
||||||
|
# include <unixlib.h>
|
||||||
|
***************
|
||||||
|
*** 226,232 ****
|
||||||
|
--- 229,239 ----
|
||||||
|
# ifdef FEAT_GUI_GTK
|
||||||
|
# include "gui_gtk_vms.h"
|
||||||
|
# endif
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
+
|
||||||
|
+ #ifdef VMS
|
||||||
|
typedef struct dsc$descriptor DESC;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
*** ../vim-7.3.718/src/os_beos.c 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/os_beos.c 2012-11-20 16:22:17.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 13,19 ****
|
||||||
|
|
||||||
|
#include <float.h>
|
||||||
|
#include <termios.h>
|
||||||
|
! #include <kernel/OS.h>
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
#if USE_THREAD_FOR_INPUT_WITH_TIMEOUT
|
||||||
|
--- 13,22 ----
|
||||||
|
|
||||||
|
#include <float.h>
|
||||||
|
#include <termios.h>
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <kernel/OS.h>
|
||||||
|
! #endif
|
||||||
|
!
|
||||||
|
#include "vim.h"
|
||||||
|
|
||||||
|
#if USE_THREAD_FOR_INPUT_WITH_TIMEOUT
|
||||||
|
*** ../vim-7.3.718/src/os_beos.h 2010-08-15 21:57:32.000000000 +0200
|
||||||
|
--- src/os_beos.h 2012-11-20 16:22:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 22,25 ****
|
||||||
|
|
||||||
|
/* select emulation */
|
||||||
|
|
||||||
|
! #include <net/socket.h> /* for typedefs and #defines only */
|
||||||
|
--- 22,27 ----
|
||||||
|
|
||||||
|
/* select emulation */
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! # include <net/socket.h> /* for typedefs and #defines only */
|
||||||
|
! #endif
|
||||||
|
*** ../vim-7.3.718/src/version.c 2012-11-20 12:16:54.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 16:32:18.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 719,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
George: "I just got a new set of golf clubs for my wife!"
|
||||||
|
John: "Great trade!"
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
226
7.3.720
Normal file
226
7.3.720
Normal file
@ -0,0 +1,226 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.720
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.720
|
||||||
|
Problem: Proto files are outdated.
|
||||||
|
Solution: Update the newly generated proto files.
|
||||||
|
Files: src/proto/digraph.pro, src/proto/fold.pro, src/proto/misc1.pro,
|
||||||
|
src/proto/move.pro, src/proto/screen.pro, src/proto/search.pro,
|
||||||
|
src/proto/os_win32.pro, src/proto/os_mswin.pro,
|
||||||
|
src/proto/os_beos.pro
|
||||||
|
|
||||||
|
*** ../vim-7.3.719/src/proto/digraph.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/digraph.pro 2012-11-20 16:51:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1,7 ****
|
||||||
|
/* digraph.c */
|
||||||
|
int do_digraph __ARGS((int c));
|
||||||
|
int get_digraph __ARGS((int cmdline));
|
||||||
|
! int getdigraph __ARGS((int char1, int char2, int meta));
|
||||||
|
void putdigraph __ARGS((char_u *str));
|
||||||
|
void listdigraphs __ARGS((void));
|
||||||
|
char_u *keymap_init __ARGS((void));
|
||||||
|
--- 1,7 ----
|
||||||
|
/* digraph.c */
|
||||||
|
int do_digraph __ARGS((int c));
|
||||||
|
int get_digraph __ARGS((int cmdline));
|
||||||
|
! int getdigraph __ARGS((int char1, int char2, int meta_char));
|
||||||
|
void putdigraph __ARGS((char_u *str));
|
||||||
|
void listdigraphs __ARGS((void));
|
||||||
|
char_u *keymap_init __ARGS((void));
|
||||||
|
*** ../vim-7.3.719/src/proto/fold.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/fold.pro 2012-11-20 16:51:49.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 27,33 ****
|
||||||
|
void foldUpdate __ARGS((win_T *wp, linenr_T top, linenr_T bot));
|
||||||
|
void foldUpdateAll __ARGS((win_T *win));
|
||||||
|
int foldMoveTo __ARGS((int updown, int dir, long count));
|
||||||
|
! void foldInitWin __ARGS((win_T *newwin));
|
||||||
|
int find_wl_entry __ARGS((win_T *win, linenr_T lnum));
|
||||||
|
void foldAdjustVisual __ARGS((void));
|
||||||
|
void foldAdjustCursor __ARGS((void));
|
||||||
|
--- 27,33 ----
|
||||||
|
void foldUpdate __ARGS((win_T *wp, linenr_T top, linenr_T bot));
|
||||||
|
void foldUpdateAll __ARGS((win_T *win));
|
||||||
|
int foldMoveTo __ARGS((int updown, int dir, long count));
|
||||||
|
! void foldInitWin __ARGS((win_T *new_win));
|
||||||
|
int find_wl_entry __ARGS((win_T *win, linenr_T lnum));
|
||||||
|
void foldAdjustVisual __ARGS((void));
|
||||||
|
void foldAdjustCursor __ARGS((void));
|
||||||
|
*** ../vim-7.3.719/src/proto/misc1.pro 2012-08-15 14:04:50.000000000 +0200
|
||||||
|
--- src/proto/misc1.pro 2012-11-20 16:51:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 5,12 ****
|
||||||
|
int get_indent_str __ARGS((char_u *ptr, int ts));
|
||||||
|
int set_indent __ARGS((int size, int flags));
|
||||||
|
int get_number_indent __ARGS((linenr_T lnum));
|
||||||
|
! int open_line __ARGS((int dir, int flags, int old_indent));
|
||||||
|
! int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int do_skip_space));
|
||||||
|
int get_last_leader_offset __ARGS((char_u *line, char_u **flags));
|
||||||
|
int plines __ARGS((linenr_T lnum));
|
||||||
|
int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
|
||||||
|
--- 5,12 ----
|
||||||
|
int get_indent_str __ARGS((char_u *ptr, int ts));
|
||||||
|
int set_indent __ARGS((int size, int flags));
|
||||||
|
int get_number_indent __ARGS((linenr_T lnum));
|
||||||
|
! int open_line __ARGS((int dir, int flags, int second_line_indent));
|
||||||
|
! int get_leader_len __ARGS((char_u *line, char_u **flags, int backward, int include_space));
|
||||||
|
int get_last_leader_offset __ARGS((char_u *line, char_u **flags));
|
||||||
|
int plines __ARGS((linenr_T lnum));
|
||||||
|
int plines_win __ARGS((win_T *wp, linenr_T lnum, int winheight));
|
||||||
|
***************
|
||||||
|
*** 59,65 ****
|
||||||
|
void vim_setenv __ARGS((char_u *name, char_u *val));
|
||||||
|
char_u *get_env_name __ARGS((expand_T *xp, int idx));
|
||||||
|
char_u *get_users __ARGS((expand_T *xp, int idx));
|
||||||
|
! int match_user __ARGS((char_u* name));
|
||||||
|
void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
|
||||||
|
char_u *home_replace_save __ARGS((buf_T *buf, char_u *src));
|
||||||
|
int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname));
|
||||||
|
--- 59,65 ----
|
||||||
|
void vim_setenv __ARGS((char_u *name, char_u *val));
|
||||||
|
char_u *get_env_name __ARGS((expand_T *xp, int idx));
|
||||||
|
char_u *get_users __ARGS((expand_T *xp, int idx));
|
||||||
|
! int match_user __ARGS((char_u *name));
|
||||||
|
void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
|
||||||
|
char_u *home_replace_save __ARGS((buf_T *buf, char_u *src));
|
||||||
|
int fullpathcmp __ARGS((char_u *s1, char_u *s2, int checkname));
|
||||||
|
*** ../vim-7.3.719/src/proto/move.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/move.pro 2012-11-20 16:51:57.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 24,30 ****
|
||||||
|
int curwin_col_off __ARGS((void));
|
||||||
|
int win_col_off2 __ARGS((win_T *wp));
|
||||||
|
int curwin_col_off2 __ARGS((void));
|
||||||
|
! void curs_columns __ARGS((int scroll));
|
||||||
|
void scrolldown __ARGS((long line_count, int byfold));
|
||||||
|
void scrollup __ARGS((long line_count, int byfold));
|
||||||
|
void check_topfill __ARGS((win_T *wp, int down));
|
||||||
|
--- 24,30 ----
|
||||||
|
int curwin_col_off __ARGS((void));
|
||||||
|
int win_col_off2 __ARGS((win_T *wp));
|
||||||
|
int curwin_col_off2 __ARGS((void));
|
||||||
|
! void curs_columns __ARGS((int may_scroll));
|
||||||
|
void scrolldown __ARGS((long line_count, int byfold));
|
||||||
|
void scrollup __ARGS((long line_count, int byfold));
|
||||||
|
void check_topfill __ARGS((win_T *wp, int down));
|
||||||
|
*** ../vim-7.3.719/src/proto/screen.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/screen.pro 2012-11-20 16:52:01.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 31,38 ****
|
||||||
|
void screen_draw_rectangle __ARGS((int row, int col, int height, int width, int invert));
|
||||||
|
void screen_fill __ARGS((int start_row, int end_row, int start_col, int end_col, int c1, int c2, int attr));
|
||||||
|
void check_for_delay __ARGS((int check_msg_scroll));
|
||||||
|
! int screen_valid __ARGS((int clear));
|
||||||
|
! void screenalloc __ARGS((int clear));
|
||||||
|
void free_screenlines __ARGS((void));
|
||||||
|
void screenclear __ARGS((void));
|
||||||
|
int can_clear __ARGS((char_u *p));
|
||||||
|
--- 31,38 ----
|
||||||
|
void screen_draw_rectangle __ARGS((int row, int col, int height, int width, int invert));
|
||||||
|
void screen_fill __ARGS((int start_row, int end_row, int start_col, int end_col, int c1, int c2, int attr));
|
||||||
|
void check_for_delay __ARGS((int check_msg_scroll));
|
||||||
|
! int screen_valid __ARGS((int doclear));
|
||||||
|
! void screenalloc __ARGS((int doclear));
|
||||||
|
void free_screenlines __ARGS((void));
|
||||||
|
void screenclear __ARGS((void));
|
||||||
|
int can_clear __ARGS((char_u *p));
|
||||||
|
*** ../vim-7.3.719/src/proto/search.pro 2012-07-25 15:06:20.000000000 +0200
|
||||||
|
--- src/proto/search.pro 2012-11-20 16:52:01.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 27,38 ****
|
||||||
|
int end_word __ARGS((long count, int bigword, int stop, int empty));
|
||||||
|
int bckend_word __ARGS((long count, int bigword, int eol));
|
||||||
|
int current_word __ARGS((oparg_T *oap, long count, int include, int bigword));
|
||||||
|
- int current_search __ARGS((long count, int forward));
|
||||||
|
int current_sent __ARGS((oparg_T *oap, long count, int include));
|
||||||
|
int current_block __ARGS((oparg_T *oap, long count, int include, int what, int other));
|
||||||
|
int current_tagblock __ARGS((oparg_T *oap, long count_arg, int include));
|
||||||
|
int current_par __ARGS((oparg_T *oap, long count, int include, int type));
|
||||||
|
int current_quote __ARGS((oparg_T *oap, long count, int include, int quotechar));
|
||||||
|
int linewhite __ARGS((linenr_T lnum));
|
||||||
|
void find_pattern_in_path __ARGS((char_u *ptr, int dir, int len, int whole, int skip_comments, int type, long count, int action, linenr_T start_lnum, linenr_T end_lnum));
|
||||||
|
int read_viminfo_search_pattern __ARGS((vir_T *virp, int force));
|
||||||
|
--- 27,38 ----
|
||||||
|
int end_word __ARGS((long count, int bigword, int stop, int empty));
|
||||||
|
int bckend_word __ARGS((long count, int bigword, int eol));
|
||||||
|
int current_word __ARGS((oparg_T *oap, long count, int include, int bigword));
|
||||||
|
int current_sent __ARGS((oparg_T *oap, long count, int include));
|
||||||
|
int current_block __ARGS((oparg_T *oap, long count, int include, int what, int other));
|
||||||
|
int current_tagblock __ARGS((oparg_T *oap, long count_arg, int include));
|
||||||
|
int current_par __ARGS((oparg_T *oap, long count, int include, int type));
|
||||||
|
int current_quote __ARGS((oparg_T *oap, long count, int include, int quotechar));
|
||||||
|
+ int current_search __ARGS((long count, int forward));
|
||||||
|
int linewhite __ARGS((linenr_T lnum));
|
||||||
|
void find_pattern_in_path __ARGS((char_u *ptr, int dir, int len, int whole, int skip_comments, int type, long count, int action, linenr_T start_lnum, linenr_T end_lnum));
|
||||||
|
int read_viminfo_search_pattern __ARGS((vir_T *virp, int force));
|
||||||
|
*** ../vim-7.3.719/src/proto/os_win32.pro 2011-05-05 18:31:54.000000000 +0200
|
||||||
|
--- src/proto/os_win32.pro 2012-11-20 16:52:13.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 22,28 ****
|
||||||
|
int mch_isdir __ARGS((char_u *name));
|
||||||
|
int mch_mkdir __ARGS((char_u *name));
|
||||||
|
int mch_is_linked __ARGS((char_u *fname));
|
||||||
|
! int win32_fileinfo __ARGS((char_u *name, BY_HANDLE_FILE_INFORMATION *lpFileInfo));
|
||||||
|
int mch_writable __ARGS((char_u *name));
|
||||||
|
int mch_can_exe __ARGS((char_u *name));
|
||||||
|
int mch_nodetype __ARGS((char_u *name));
|
||||||
|
--- 22,28 ----
|
||||||
|
int mch_isdir __ARGS((char_u *name));
|
||||||
|
int mch_mkdir __ARGS((char_u *name));
|
||||||
|
int mch_is_linked __ARGS((char_u *fname));
|
||||||
|
! int win32_fileinfo __ARGS((char_u *fname, BY_HANDLE_FILE_INFORMATION *info));
|
||||||
|
int mch_writable __ARGS((char_u *name));
|
||||||
|
int mch_can_exe __ARGS((char_u *name));
|
||||||
|
int mch_nodetype __ARGS((char_u *name));
|
||||||
|
*** ../vim-7.3.719/src/proto/os_mswin.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/os_mswin.pro 2012-11-20 16:52:14.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 28,38 ****
|
||||||
|
void WideCharToMultiByte_alloc __ARGS((UINT cp, DWORD flags, LPCWSTR in, int inlen, LPSTR *out, int *outlen, LPCSTR def, LPBOOL useddef));
|
||||||
|
int clip_mch_own_selection __ARGS((VimClipboard *cbd));
|
||||||
|
void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
|
||||||
|
short_u *enc_to_utf16 __ARGS((char_u *str, int *lenp));
|
||||||
|
char_u *utf16_to_enc __ARGS((short_u *str, int *lenp));
|
||||||
|
- void clip_mch_request_selection __ARGS((VimClipboard *cbd));
|
||||||
|
void acp_to_enc __ARGS((char_u *str, int str_size, char_u **out, int *outlen));
|
||||||
|
- void clip_mch_set_selection __ARGS((VimClipboard *cbd));
|
||||||
|
void DumpPutS __ARGS((const char *psz));
|
||||||
|
int mch_get_winpos __ARGS((int *x, int *y));
|
||||||
|
void mch_set_winpos __ARGS((int x, int y));
|
||||||
|
--- 28,38 ----
|
||||||
|
void WideCharToMultiByte_alloc __ARGS((UINT cp, DWORD flags, LPCWSTR in, int inlen, LPSTR *out, int *outlen, LPCSTR def, LPBOOL useddef));
|
||||||
|
int clip_mch_own_selection __ARGS((VimClipboard *cbd));
|
||||||
|
void clip_mch_lose_selection __ARGS((VimClipboard *cbd));
|
||||||
|
+ void clip_mch_request_selection __ARGS((VimClipboard *cbd));
|
||||||
|
+ void clip_mch_set_selection __ARGS((VimClipboard *cbd));
|
||||||
|
short_u *enc_to_utf16 __ARGS((char_u *str, int *lenp));
|
||||||
|
char_u *utf16_to_enc __ARGS((short_u *str, int *lenp));
|
||||||
|
void acp_to_enc __ARGS((char_u *str, int str_size, char_u **out, int *outlen));
|
||||||
|
void DumpPutS __ARGS((const char *psz));
|
||||||
|
int mch_get_winpos __ARGS((int *x, int *y));
|
||||||
|
void mch_set_winpos __ARGS((int x, int y));
|
||||||
|
*** ../vim-7.3.719/src/version.c 2012-11-20 16:53:34.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 16:55:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 720,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Light travels faster than sound. This is why some people
|
||||||
|
appear bright until you hear them speak
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
60
7.3.721
Normal file
60
7.3.721
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.721
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.721
|
||||||
|
Problem: Ruby interface defines local functions globally.
|
||||||
|
Solution: Make the functions static.
|
||||||
|
Files: src/if_ruby.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.720/src/if_ruby.c 2012-10-03 18:06:55.000000000 +0200
|
||||||
|
--- src/if_ruby.c 2012-11-20 15:35:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 336,346 ****
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef RUBY19_OR_LATER
|
||||||
|
! SIGNED_VALUE rb_num2long_stub(VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_num2long(x);
|
||||||
|
}
|
||||||
|
! VALUE rb_int2big_stub(SIGNED_VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_int2big(x);
|
||||||
|
}
|
||||||
|
--- 336,346 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef RUBY19_OR_LATER
|
||||||
|
! static SIGNED_VALUE rb_num2long_stub(VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_num2long(x);
|
||||||
|
}
|
||||||
|
! static VALUE rb_int2big_stub(SIGNED_VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_int2big(x);
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.720/src/version.c 2012-11-20 16:56:49.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 16:58:32.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 721,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
39. You move into a new house and decide to Netscape before you landscape.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
58
7.3.722
Normal file
58
7.3.722
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.722
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.722
|
||||||
|
Problem: Perl flags may contain "-g", which breaks "make proto".
|
||||||
|
Solution: Filter out the "-g" flag for cproto. (Ken Takata)
|
||||||
|
Files: src/Makefile
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.721/src/Makefile 2012-07-25 16:32:03.000000000 +0200
|
||||||
|
--- src/Makefile 2012-11-20 17:02:22.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1753,1762 ****
|
||||||
|
# Filter out arguments that cproto doesn't support.
|
||||||
|
# Don't pass "-pthread" to cproto, it sees it as a list of individual flags.
|
||||||
|
# Don't pass "-fstack-protector" to cproto, for the same reason.
|
||||||
|
# The -E"gcc -E" argument must be separate to avoid problems with shell
|
||||||
|
# quoting.
|
||||||
|
CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
|
||||||
|
! `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g'`
|
||||||
|
|
||||||
|
### Would be nice if this would work for "normal" make.
|
||||||
|
### Currently it only works for (Free)BSD make.
|
||||||
|
--- 1753,1763 ----
|
||||||
|
# Filter out arguments that cproto doesn't support.
|
||||||
|
# Don't pass "-pthread" to cproto, it sees it as a list of individual flags.
|
||||||
|
# Don't pass "-fstack-protector" to cproto, for the same reason.
|
||||||
|
+ # Don't pass "-g" to cproto.
|
||||||
|
# The -E"gcc -E" argument must be separate to avoid problems with shell
|
||||||
|
# quoting.
|
||||||
|
CPROTO = cproto $(PROTO_FLAGS) -DPROTO \
|
||||||
|
! `echo '$(LINT_CFLAGS)' | sed -e 's/-pthread//g' -e 's/-fstack-protector//g' -e 's/\ -g\ / /g'`
|
||||||
|
|
||||||
|
### Would be nice if this would work for "normal" make.
|
||||||
|
### Currently it only works for (Free)BSD make.
|
||||||
|
*** ../vim-7.3.721/src/version.c 2012-11-20 16:59:09.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 17:02:54.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 722,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
The future isn't what it used to be.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
264
7.3.723
Normal file
264
7.3.723
Normal file
@ -0,0 +1,264 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.723
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.723
|
||||||
|
Problem: Various tiny problems.
|
||||||
|
Solution: Various tiny fixes.
|
||||||
|
Files: src/gui_mac.c, src/xpm_w32.c, src/netbeans.c, src/sha256.c,
|
||||||
|
src/if_sniff.c, README.txt
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.722/src/gui_mac.c 2011-12-14 15:07:11.000000000 +0100
|
||||||
|
--- src/gui_mac.c 2012-06-20 18:16:12.000000000 +0200
|
||||||
|
***************
|
||||||
|
*** 5728,5734 ****
|
||||||
|
case VIM_QUESTION: useIcon = kNoteIcon; break;
|
||||||
|
case VIM_WARNING: useIcon = kCautionIcon; break;
|
||||||
|
case VIM_ERROR: useIcon = kStopIcon; break;
|
||||||
|
! default: useIcon = kStopIcon;
|
||||||
|
}
|
||||||
|
AppendDITL(theDialog, iconDITL, overlayDITL);
|
||||||
|
ReleaseResource(iconDITL);
|
||||||
|
--- 5728,5734 ----
|
||||||
|
case VIM_QUESTION: useIcon = kNoteIcon; break;
|
||||||
|
case VIM_WARNING: useIcon = kCautionIcon; break;
|
||||||
|
case VIM_ERROR: useIcon = kStopIcon; break;
|
||||||
|
! default: useIcon = kStopIcon;
|
||||||
|
}
|
||||||
|
AppendDITL(theDialog, iconDITL, overlayDITL);
|
||||||
|
ReleaseResource(iconDITL);
|
||||||
|
*** ../vim-7.3.722/src/xpm_w32.c 2012-02-05 00:47:56.000000000 +0100
|
||||||
|
--- src/xpm_w32.c 2012-08-02 21:46:20.000000000 +0200
|
||||||
|
***************
|
||||||
|
*** 55,61 ****
|
||||||
|
return -1;
|
||||||
|
if (shp == NULL)
|
||||||
|
{
|
||||||
|
! if (img)
|
||||||
|
XDestroyImage(img);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
--- 55,61 ----
|
||||||
|
return -1;
|
||||||
|
if (shp == NULL)
|
||||||
|
{
|
||||||
|
! if (img)
|
||||||
|
XDestroyImage(img);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.722/src/netbeans.c 2012-04-20 19:47:00.000000000 +0200
|
||||||
|
--- src/netbeans.c 2012-06-20 19:56:18.000000000 +0200
|
||||||
|
***************
|
||||||
|
*** 978,984 ****
|
||||||
|
buf_list_used = 0;
|
||||||
|
|
||||||
|
/* free the queued key commands */
|
||||||
|
! while(key_node != NULL && key_node != &keyHead)
|
||||||
|
{
|
||||||
|
keyQ_T *next = key_node->next;
|
||||||
|
vim_free(key_node->keystr);
|
||||||
|
--- 978,984 ----
|
||||||
|
buf_list_used = 0;
|
||||||
|
|
||||||
|
/* free the queued key commands */
|
||||||
|
! while (key_node != NULL && key_node != &keyHead)
|
||||||
|
{
|
||||||
|
keyQ_T *next = key_node->next;
|
||||||
|
vim_free(key_node->keystr);
|
||||||
|
***************
|
||||||
|
*** 993,999 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
/* free the queued netbeans commands */
|
||||||
|
! while(cmd_node != NULL && cmd_node != &head)
|
||||||
|
{
|
||||||
|
queue_T *next = cmd_node->next;
|
||||||
|
vim_free(cmd_node->buffer);
|
||||||
|
--- 993,999 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
/* free the queued netbeans commands */
|
||||||
|
! while (cmd_node != NULL && cmd_node != &head)
|
||||||
|
{
|
||||||
|
queue_T *next = cmd_node->next;
|
||||||
|
vim_free(cmd_node->buffer);
|
||||||
|
*** ../vim-7.3.722/src/sha256.c 2010-08-15 21:57:25.000000000 +0200
|
||||||
|
--- src/sha256.c 2012-03-18 21:35:07.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7,15 ****
|
||||||
|
* See README.txt for an overview of the Vim source code.
|
||||||
|
*
|
||||||
|
* FIPS-180-2 compliant SHA-256 implementation
|
||||||
|
! * GPL by Christophe Devine.
|
||||||
|
* Modified for md5deep, in public domain.
|
||||||
|
* Modified For Vim, Mohsin Ahmed, http://www.cs.albany.edu/~mosh
|
||||||
|
*
|
||||||
|
* Vim specific notes:
|
||||||
|
* Functions exported by this file:
|
||||||
|
--- 7,17 ----
|
||||||
|
* See README.txt for an overview of the Vim source code.
|
||||||
|
*
|
||||||
|
* FIPS-180-2 compliant SHA-256 implementation
|
||||||
|
! * GPL by Christophe Devine, applies to older version.
|
||||||
|
* Modified for md5deep, in public domain.
|
||||||
|
* Modified For Vim, Mohsin Ahmed, http://www.cs.albany.edu/~mosh
|
||||||
|
+ * Mohsin Ahmed states this work is distributed under the VIM License or GPL,
|
||||||
|
+ * at your choice.
|
||||||
|
*
|
||||||
|
* Vim specific notes:
|
||||||
|
* Functions exported by this file:
|
||||||
|
*** ../vim-7.3.722/src/if_sniff.c 2010-12-17 18:06:00.000000000 +0100
|
||||||
|
--- src/if_sniff.c 2012-06-20 19:56:09.000000000 +0200
|
||||||
|
***************
|
||||||
|
*** 449,455 ****
|
||||||
|
if (!sniff_cmd)
|
||||||
|
{
|
||||||
|
struct sn_cmd_list *list = sniff_cmd_ext;
|
||||||
|
! while(list)
|
||||||
|
{
|
||||||
|
if (!strcmp(cmd, list->sniff_cmd->cmd_name))
|
||||||
|
{
|
||||||
|
--- 449,455 ----
|
||||||
|
if (!sniff_cmd)
|
||||||
|
{
|
||||||
|
struct sn_cmd_list *list = sniff_cmd_ext;
|
||||||
|
! while (list)
|
||||||
|
{
|
||||||
|
if (!strcmp(cmd, list->sniff_cmd->cmd_name))
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 479,485 ****
|
||||||
|
/* unescape message text */
|
||||||
|
char *p = msg;
|
||||||
|
char *end = p+strlen(msg);
|
||||||
|
! while(*p)
|
||||||
|
{
|
||||||
|
if (*p == '\\')
|
||||||
|
mch_memmove(p,p+1,end-p);
|
||||||
|
--- 479,485 ----
|
||||||
|
/* unescape message text */
|
||||||
|
char *p = msg;
|
||||||
|
char *end = p+strlen(msg);
|
||||||
|
! while (*p)
|
||||||
|
{
|
||||||
|
if (*p == '\\')
|
||||||
|
mch_memmove(p,p+1,end-p);
|
||||||
|
***************
|
||||||
|
*** 489,495 ****
|
||||||
|
SNIFF_TRACE1("request def = %s\n",def);
|
||||||
|
SNIFF_TRACE1("request msg = %s\n",msg);
|
||||||
|
|
||||||
|
! while(list && list->next_cmd)
|
||||||
|
list = list->next_cmd;
|
||||||
|
if (!list)
|
||||||
|
sniff_cmd_ext = cmd_node;
|
||||||
|
--- 489,495 ----
|
||||||
|
SNIFF_TRACE1("request def = %s\n",def);
|
||||||
|
SNIFF_TRACE1("request msg = %s\n",msg);
|
||||||
|
|
||||||
|
! while (list && list->next_cmd)
|
||||||
|
list = list->next_cmd;
|
||||||
|
if (!list)
|
||||||
|
sniff_cmd_ext = cmd_node;
|
||||||
|
***************
|
||||||
|
*** 628,634 ****
|
||||||
|
gui_mch_wait_for_chars(0L);
|
||||||
|
#endif
|
||||||
|
#ifdef WIN32
|
||||||
|
! while(sniffBufStart != NULL)
|
||||||
|
{
|
||||||
|
struct sniffBufNode *node = sniffBufStart;
|
||||||
|
sniffBufStart = sniffBufStart->next;
|
||||||
|
--- 628,634 ----
|
||||||
|
gui_mch_wait_for_chars(0L);
|
||||||
|
#endif
|
||||||
|
#ifdef WIN32
|
||||||
|
! while (sniffBufStart != NULL)
|
||||||
|
{
|
||||||
|
struct sniffBufNode *node = sniffBufStart;
|
||||||
|
sniffBufStart = sniffBufStart->next;
|
||||||
|
***************
|
||||||
|
*** 789,795 ****
|
||||||
|
command = buffer[0];
|
||||||
|
arguments = &buffer[1];
|
||||||
|
token = strtok(arguments, sniff_rq_sep);
|
||||||
|
! while(argc <3)
|
||||||
|
{
|
||||||
|
if (token)
|
||||||
|
{
|
||||||
|
--- 789,795 ----
|
||||||
|
command = buffer[0];
|
||||||
|
arguments = &buffer[1];
|
||||||
|
token = strtok(arguments, sniff_rq_sep);
|
||||||
|
! while (argc <3)
|
||||||
|
{
|
||||||
|
if (token)
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 925,931 ****
|
||||||
|
default :
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
! while(argc)
|
||||||
|
vim_free(argv[--argc]);
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 925,931 ----
|
||||||
|
default :
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
! while (argc)
|
||||||
|
vim_free(argv[--argc]);
|
||||||
|
}
|
||||||
|
|
||||||
|
*** ../vim-7.3.722/README.txt 2010-08-15 21:56:43.000000000 +0200
|
||||||
|
--- README.txt 2012-10-28 18:58:18.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 97,103 ****
|
||||||
|
If you have problems, have a look at the Vim FAQ:
|
||||||
|
http://vimdoc.sf.net/vimfaq.html
|
||||||
|
|
||||||
|
! Send bug reports to:
|
||||||
|
Bram Moolenaar <Bram@vim.org>
|
||||||
|
|
||||||
|
There are several mailing lists for Vim, see http://www.vim.org/maillist.php.
|
||||||
|
--- 97,107 ----
|
||||||
|
If you have problems, have a look at the Vim FAQ:
|
||||||
|
http://vimdoc.sf.net/vimfaq.html
|
||||||
|
|
||||||
|
! If you still have problems, use one of the maillists to discuss t with Vim
|
||||||
|
! users and developers:
|
||||||
|
! http://www.vim.org/maillist.php
|
||||||
|
!
|
||||||
|
! If nothing else works, report bugs directly:
|
||||||
|
Bram Moolenaar <Bram@vim.org>
|
||||||
|
|
||||||
|
There are several mailing lists for Vim, see http://www.vim.org/maillist.php.
|
||||||
|
*** ../vim-7.3.722/src/version.c 2012-11-20 17:03:23.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 17:14:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 723,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
"Oh, no! NOT the Spanish Inquisition!"
|
||||||
|
"NOBODY expects the Spanish Inquisition!!!"
|
||||||
|
-- Monty Python sketch --
|
||||||
|
"Oh, no! NOT another option!"
|
||||||
|
"EVERYBODY expects another option!!!"
|
||||||
|
-- Discussion in vim-dev mailing list --
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
50
7.3.724
Normal file
50
7.3.724
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.724
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.724
|
||||||
|
Problem: Building with Ruby and Tcl on MS-Windows 64 bit does not work.
|
||||||
|
Solution: Remove Ruby and Tcl from the big MS-Windows build.
|
||||||
|
Files: src/bigvim64.bat
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.723/src/bigvim64.bat 2012-08-29 14:18:26.000000000 +0200
|
||||||
|
--- src/bigvim64.bat 2012-08-29 17:32:55.000000000 +0200
|
||||||
|
***************
|
||||||
|
*** 1,6 ****
|
||||||
|
:: command to build big Vim 64 bit with OLE, Perl, Python, Ruby and Tcl
|
||||||
|
:: First run: %VCDIR%\vcvarsall.bat x86_amd64
|
||||||
|
SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\"
|
||||||
|
SET TOOLDIR=E:\
|
||||||
|
! %VCDIR%\bin\nmake -f Make_mvc.mak CPU=AMD64 GUI=yes OLE=yes PERL=E:\perl514 DYNAMIC_PERL=yes PERL_VER=514 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python32 DYNAMIC_PYTHON3=yes PYTHON3_VER=32 RUBY=%TOOLDIR%ruby192 DYNAMIC_RUBY=yes RUBY_VER=192 RUBY_VER_LONG=1.9.2 TCL=%TOOLDIR%tcl TCL_VER=85 TCL_VER_LONG=8.5 DYNAMIC_TCL=yes %1 IME=yes CSCOPE=yes
|
||||||
|
|
||||||
|
--- 1,7 ----
|
||||||
|
:: command to build big Vim 64 bit with OLE, Perl, Python, Ruby and Tcl
|
||||||
|
:: First run: %VCDIR%\vcvarsall.bat x86_amd64
|
||||||
|
+ :: Ruby and Tcl are excluded, doesn't seem to work.
|
||||||
|
SET VCDIR="C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\"
|
||||||
|
SET TOOLDIR=E:\
|
||||||
|
! %VCDIR%\bin\nmake -f Make_mvc.mak CPU=AMD64 GUI=yes OLE=yes PERL=E:\perl514 DYNAMIC_PERL=yes PERL_VER=514 PYTHON=%TOOLDIR%python27 DYNAMIC_PYTHON=yes PYTHON_VER=27 PYTHON3=%TOOLDIR%python32 DYNAMIC_PYTHON3=yes PYTHON3_VER=32 %1 IME=yes CSCOPE=yes
|
||||||
|
|
||||||
|
*** ../vim-7.3.723/src/version.c 2012-11-20 17:18:56.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 17:20:51.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 724,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Microsoft is to software what McDonalds is to gourmet cooking
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
58
7.3.725
Normal file
58
7.3.725
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.725
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.725
|
||||||
|
Problem: :aboveleft and :belowright have no effect on :copen.
|
||||||
|
Solution: Check for cmdmod.split. (Christian Brabandt)
|
||||||
|
Files: src/quickfix.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.724/src/quickfix.c 2012-11-14 22:38:04.000000000 +0100
|
||||||
|
--- src/quickfix.c 2012-11-20 17:51:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2347,2354 ****
|
||||||
|
/* The current window becomes the previous window afterwards. */
|
||||||
|
win = curwin;
|
||||||
|
|
||||||
|
! if (eap->cmdidx == CMD_copen || eap->cmdidx == CMD_cwindow)
|
||||||
|
! /* Create the new window at the very bottom. */
|
||||||
|
win_goto(lastwin);
|
||||||
|
if (win_split(height, WSP_BELOW | WSP_NEWLOC) == FAIL)
|
||||||
|
return; /* not enough room for window */
|
||||||
|
--- 2347,2356 ----
|
||||||
|
/* The current window becomes the previous window afterwards. */
|
||||||
|
win = curwin;
|
||||||
|
|
||||||
|
! if ((eap->cmdidx == CMD_copen || eap->cmdidx == CMD_cwindow)
|
||||||
|
! && cmdmod.split == 0)
|
||||||
|
! /* Create the new window at the very bottom, except when
|
||||||
|
! * :belowright or :aboveleft is used. */
|
||||||
|
win_goto(lastwin);
|
||||||
|
if (win_split(height, WSP_BELOW | WSP_NEWLOC) == FAIL)
|
||||||
|
return; /* not enough room for window */
|
||||||
|
*** ../vim-7.3.724/src/version.c 2012-11-20 17:21:29.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-20 17:50:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 725,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
40. You tell the cab driver you live at
|
||||||
|
http://123.elm.street/house/bluetrim.html
|
||||||
|
41. You actually try that 123.elm.street address.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
66
7.3.726
Normal file
66
7.3.726
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.726
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.726
|
||||||
|
Problem: Typos and duplicate info in README.
|
||||||
|
Solution: Fix the text.
|
||||||
|
Files: README.txt
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.725/README.txt 2012-11-20 17:18:56.000000000 +0100
|
||||||
|
--- README.txt 2012-11-21 12:28:58.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 97,111 ****
|
||||||
|
If you have problems, have a look at the Vim FAQ:
|
||||||
|
http://vimdoc.sf.net/vimfaq.html
|
||||||
|
|
||||||
|
! If you still have problems, use one of the maillists to discuss t with Vim
|
||||||
|
! users and developers:
|
||||||
|
http://www.vim.org/maillist.php
|
||||||
|
|
||||||
|
If nothing else works, report bugs directly:
|
||||||
|
Bram Moolenaar <Bram@vim.org>
|
||||||
|
|
||||||
|
- There are several mailing lists for Vim, see http://www.vim.org/maillist.php.
|
||||||
|
-
|
||||||
|
|
||||||
|
MAIN AUTHOR
|
||||||
|
|
||||||
|
--- 97,109 ----
|
||||||
|
If you have problems, have a look at the Vim FAQ:
|
||||||
|
http://vimdoc.sf.net/vimfaq.html
|
||||||
|
|
||||||
|
! If you still have problems or any other questions, use one of the mailing
|
||||||
|
! lists to discuss them with Vim users and developers:
|
||||||
|
http://www.vim.org/maillist.php
|
||||||
|
|
||||||
|
If nothing else works, report bugs directly:
|
||||||
|
Bram Moolenaar <Bram@vim.org>
|
||||||
|
|
||||||
|
|
||||||
|
MAIN AUTHOR
|
||||||
|
|
||||||
|
*** ../vim-7.3.725/src/version.c 2012-11-20 17:55:06.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-23 21:44:38.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 726,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Q: Should I clean my house or work on Vim?
|
||||||
|
A: Whatever contains more bugs.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
55
7.3.727
Normal file
55
7.3.727
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.727
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.727
|
||||||
|
Problem: Can't always find Win32.mak when building GvimExt.
|
||||||
|
Solution: Use same mechanism as in Make_mvc.mak. (Cade Foster)
|
||||||
|
Files: src/GvimExt/Makefile
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.726/src/GvimExt/Makefile 2010-08-15 21:57:29.000000000 +0200
|
||||||
|
--- src/GvimExt/Makefile 2012-11-21 19:53:02.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 10,16 ****
|
||||||
|
NODEBUG = 1
|
||||||
|
!endif
|
||||||
|
|
||||||
|
! !include <win32.mak>
|
||||||
|
|
||||||
|
all: gvimext.dll
|
||||||
|
|
||||||
|
--- 10,20 ----
|
||||||
|
NODEBUG = 1
|
||||||
|
!endif
|
||||||
|
|
||||||
|
! !ifdef SDK_INCLUDE_DIR
|
||||||
|
! !include $(SDK_INCLUDE_DIR)\Win32.mak
|
||||||
|
! !else
|
||||||
|
! !include <Win32.mak>
|
||||||
|
! !endif
|
||||||
|
|
||||||
|
all: gvimext.dll
|
||||||
|
|
||||||
|
*** ../vim-7.3.726/src/version.c 2012-11-23 21:45:20.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-23 21:46:35.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 727,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Time is money. Especially if you make clocks.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
191
7.3.728
Normal file
191
7.3.728
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.728
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.728
|
||||||
|
Problem: Cannot compile with MzScheme interface on Ubuntu 12.10.
|
||||||
|
Solution: Find the collects directory under /usr/share.
|
||||||
|
Files: src/configure.in, src/auto/configure
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.727/src/configure.in 2012-10-03 21:09:33.000000000 +0200
|
||||||
|
--- src/configure.in 2012-11-23 21:51:39.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 650,666 ****
|
||||||
|
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
|
||||||
|
! SCHEME_COLLECTS=lib/plt/
|
||||||
|
else
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
|
||||||
|
! SCHEME_COLLECTS=lib/racket/
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
else
|
||||||
|
! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
--- 650,679 ----
|
||||||
|
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
+ AC_MSG_CHECKING(for racket collects directory)
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
|
||||||
|
! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
|
||||||
|
else
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
|
||||||
|
! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
|
||||||
|
! else
|
||||||
|
! if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
|
||||||
|
! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
|
||||||
|
! fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
! if test "X$SCHEME_COLLECTS" != "X" ; then
|
||||||
|
! AC_MSG_RESULT(${SCHEME_COLLECTS})
|
||||||
|
! else
|
||||||
|
! AC_MSG_RESULT(not found)
|
||||||
|
! fi
|
||||||
|
!
|
||||||
|
! AC_MSG_CHECKING(for mzscheme_base.c)
|
||||||
|
! if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
else
|
||||||
|
! if test -f "${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
***************
|
||||||
|
*** 668,676 ****
|
||||||
|
dnl need to generate bytecode for MzScheme base
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
|
||||||
|
MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
|
||||||
|
fi
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
|
||||||
|
! -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
|
||||||
|
MZSCHEME_SRC="if_mzsch.c"
|
||||||
|
MZSCHEME_OBJ="objects/if_mzsch.o"
|
||||||
|
MZSCHEME_PRO="if_mzsch.pro"
|
||||||
|
--- 681,693 ----
|
||||||
|
dnl need to generate bytecode for MzScheme base
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
|
||||||
|
MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
|
||||||
|
+ AC_MSG_RESULT(needed)
|
||||||
|
+ else
|
||||||
|
+ AC_MSG_RESULT(not needed)
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
|
||||||
|
! -DMZSCHEME_COLLECTS='\"${SCHEME_COLLECTS}collects\"'"
|
||||||
|
MZSCHEME_SRC="if_mzsch.c"
|
||||||
|
MZSCHEME_OBJ="objects/if_mzsch.o"
|
||||||
|
MZSCHEME_PRO="if_mzsch.pro"
|
||||||
|
*** ../vim-7.3.727/src/auto/configure 2012-10-03 21:09:33.000000000 +0200
|
||||||
|
--- src/auto/configure 2012-11-23 21:51:42.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4957,4982 ****
|
||||||
|
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
|
||||||
|
! SCHEME_COLLECTS=lib/plt/
|
||||||
|
else
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
|
||||||
|
! SCHEME_COLLECTS=lib/racket/
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
else
|
||||||
|
! if test -f "${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test "X$MZSCHEME_EXTRA" != "X" ; then
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
|
||||||
|
MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
|
||||||
|
fi
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
|
||||||
|
! -DMZSCHEME_COLLECTS='\"${vi_cv_path_mzscheme_pfx}/${SCHEME_COLLECTS}collects\"'"
|
||||||
|
MZSCHEME_SRC="if_mzsch.c"
|
||||||
|
MZSCHEME_OBJ="objects/if_mzsch.o"
|
||||||
|
MZSCHEME_PRO="if_mzsch.pro"
|
||||||
|
--- 4957,5005 ----
|
||||||
|
MZSCHEME_LIBS="${MZSCHEME_LIBS} -R ${vi_cv_path_mzscheme_pfx}/lib"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for racket collects directory" >&5
|
||||||
|
+ $as_echo_n "checking for racket collects directory... " >&6; }
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/plt/collects; then
|
||||||
|
! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/plt/
|
||||||
|
else
|
||||||
|
if test -d $vi_cv_path_mzscheme_pfx/lib/racket/collects; then
|
||||||
|
! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/lib/racket/
|
||||||
|
! else
|
||||||
|
! if test -d $vi_cv_path_mzscheme_pfx/share/racket/collects; then
|
||||||
|
! SCHEME_COLLECTS=$vi_cv_path_mzscheme_pfx/share/racket/
|
||||||
|
! fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
! if test "X$SCHEME_COLLECTS" != "X" ; then
|
||||||
|
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${SCHEME_COLLECTS}" >&5
|
||||||
|
! $as_echo "${SCHEME_COLLECTS}" >&6; }
|
||||||
|
! else
|
||||||
|
! { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
|
||||||
|
! $as_echo "not found" >&6; }
|
||||||
|
! fi
|
||||||
|
!
|
||||||
|
! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mzscheme_base.c" >&5
|
||||||
|
! $as_echo_n "checking for mzscheme_base.c... " >&6; }
|
||||||
|
! if test -f "${SCHEME_COLLECTS}collects/scheme/base.ss" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
else
|
||||||
|
! if test -f "${SCHEME_COLLECTS}collects/scheme/base.rkt" ; then
|
||||||
|
MZSCHEME_EXTRA="mzscheme_base.c"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
if test "X$MZSCHEME_EXTRA" != "X" ; then
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -DINCLUDE_MZSCHEME_BASE"
|
||||||
|
MZSCHEME_MZC="${vi_cv_path_mzscheme_pfx}/bin/mzc"
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: needed" >&5
|
||||||
|
+ $as_echo "needed" >&6; }
|
||||||
|
+ else
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not needed" >&5
|
||||||
|
+ $as_echo "not needed" >&6; }
|
||||||
|
fi
|
||||||
|
+
|
||||||
|
MZSCHEME_CFLAGS="${MZSCHEME_CFLAGS} -I${SCHEME_INC} \
|
||||||
|
! -DMZSCHEME_COLLECTS='\"${SCHEME_COLLECTS}collects\"'"
|
||||||
|
MZSCHEME_SRC="if_mzsch.c"
|
||||||
|
MZSCHEME_OBJ="objects/if_mzsch.o"
|
||||||
|
MZSCHEME_PRO="if_mzsch.pro"
|
||||||
|
*** ../vim-7.3.727/src/version.c 2012-11-23 21:47:18.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-23 21:54:13.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 728,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
60. As your car crashes through the guardrail on a mountain road, your first
|
||||||
|
instinct is to search for the "back" button.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
62
7.3.729
Normal file
62
7.3.729
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.729
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.729
|
||||||
|
Problem: Building with Ruby fails on some systems.
|
||||||
|
Solution: Remove "static" and add #ifndef PROTO. (Ken Takata)
|
||||||
|
Files: src/if_ruby.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.728/src/if_ruby.c 2012-11-20 16:59:09.000000000 +0100
|
||||||
|
--- src/if_ruby.c 2012-11-24 13:32:06.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 335,346 ****
|
||||||
|
static void* (*ruby_process_options)(int, char**);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #ifdef RUBY19_OR_LATER
|
||||||
|
! static SIGNED_VALUE rb_num2long_stub(VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_num2long(x);
|
||||||
|
}
|
||||||
|
! static VALUE rb_int2big_stub(SIGNED_VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_int2big(x);
|
||||||
|
}
|
||||||
|
--- 335,346 ----
|
||||||
|
static void* (*ruby_process_options)(int, char**);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #if defined(RUBY19_OR_LATER) && !defined(PROTO)
|
||||||
|
! SIGNED_VALUE rb_num2long_stub(VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_num2long(x);
|
||||||
|
}
|
||||||
|
! VALUE rb_int2big_stub(SIGNED_VALUE x)
|
||||||
|
{
|
||||||
|
return dll_rb_int2big(x);
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.728/src/version.c 2012-11-23 21:54:43.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-24 13:34:20.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 729,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
64. The remote to the T.V. is missing...and you don't even care.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
86
7.3.730
Normal file
86
7.3.730
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.730
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.730
|
||||||
|
Problem: Crash in PHP file when using syntastic. (Ike Devolder)
|
||||||
|
Solution: Avoid using NULL pointer. (Christian Brabandt)
|
||||||
|
Files: src/quickfix.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.729/src/quickfix.c 2012-11-20 17:55:06.000000000 +0100
|
||||||
|
--- src/quickfix.c 2012-11-28 15:20:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 898,908 ****
|
||||||
|
* way with ":grep'.
|
||||||
|
*/
|
||||||
|
while (qi->qf_listcount > qi->qf_curlist + 1)
|
||||||
|
- {
|
||||||
|
- if (wp != NULL && wp->w_llist == qi)
|
||||||
|
- wp->w_llist = NULL;
|
||||||
|
qf_free(qi, --qi->qf_listcount);
|
||||||
|
- }
|
||||||
|
|
||||||
|
/*
|
||||||
|
* When the stack is full, remove to oldest entry
|
||||||
|
--- 898,904 ----
|
||||||
|
***************
|
||||||
|
*** 910,917 ****
|
||||||
|
*/
|
||||||
|
if (qi->qf_listcount == LISTCOUNT)
|
||||||
|
{
|
||||||
|
- if (wp != NULL && wp->w_llist == qi)
|
||||||
|
- wp->w_llist = NULL;
|
||||||
|
qf_free(qi, 0);
|
||||||
|
for (i = 1; i < LISTCOUNT; ++i)
|
||||||
|
qi->qf_lists[i - 1] = qi->qf_lists[i];
|
||||||
|
--- 906,911 ----
|
||||||
|
***************
|
||||||
|
*** 2135,2143 ****
|
||||||
|
while (qi->qf_lists[idx].qf_count)
|
||||||
|
{
|
||||||
|
qfp = qi->qf_lists[idx].qf_start->qf_next;
|
||||||
|
! vim_free(qi->qf_lists[idx].qf_start->qf_text);
|
||||||
|
! vim_free(qi->qf_lists[idx].qf_start->qf_pattern);
|
||||||
|
! vim_free(qi->qf_lists[idx].qf_start);
|
||||||
|
qi->qf_lists[idx].qf_start = qfp;
|
||||||
|
--qi->qf_lists[idx].qf_count;
|
||||||
|
}
|
||||||
|
--- 2129,2140 ----
|
||||||
|
while (qi->qf_lists[idx].qf_count)
|
||||||
|
{
|
||||||
|
qfp = qi->qf_lists[idx].qf_start->qf_next;
|
||||||
|
! if (qi->qf_lists[idx].qf_title != NULL)
|
||||||
|
! {
|
||||||
|
! vim_free(qi->qf_lists[idx].qf_start->qf_text);
|
||||||
|
! vim_free(qi->qf_lists[idx].qf_start->qf_pattern);
|
||||||
|
! vim_free(qi->qf_lists[idx].qf_start);
|
||||||
|
! }
|
||||||
|
qi->qf_lists[idx].qf_start = qfp;
|
||||||
|
--qi->qf_lists[idx].qf_count;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.729/src/version.c 2012-11-24 13:38:56.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 15:16:16.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 730,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
89. In addition to your e-mail address being on your business
|
||||||
|
cards you even have your own domain.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
81
7.3.731
Normal file
81
7.3.731
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.731
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.731
|
||||||
|
Problem: Py3Init_vim() is exported uneccessarily.
|
||||||
|
Solution: Make it static. (Ken Takata)
|
||||||
|
Files: src/if_python3.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.730/src/if_python3.c 2012-11-20 11:02:49.000000000 +0100
|
||||||
|
--- src/if_python3.c 2012-11-28 15:32:00.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 657,663 ****
|
||||||
|
static PyObject *globals;
|
||||||
|
|
||||||
|
static int PythonIO_Init(void);
|
||||||
|
! PyMODINIT_FUNC Py3Init_vim(void);
|
||||||
|
|
||||||
|
/******************************************************
|
||||||
|
* 1. Python interpreter main program.
|
||||||
|
--- 657,663 ----
|
||||||
|
static PyObject *globals;
|
||||||
|
|
||||||
|
static int PythonIO_Init(void);
|
||||||
|
! static PyObject *Py3Init_vim(void);
|
||||||
|
|
||||||
|
/******************************************************
|
||||||
|
* 1. Python interpreter main program.
|
||||||
|
***************
|
||||||
|
*** 1773,1780 ****
|
||||||
|
|
||||||
|
static struct PyModuleDef vimmodule;
|
||||||
|
|
||||||
|
! #ifndef PROTO
|
||||||
|
! PyMODINIT_FUNC Py3Init_vim(void)
|
||||||
|
{
|
||||||
|
PyObject *mod;
|
||||||
|
PyObject *tmp;
|
||||||
|
--- 1773,1780 ----
|
||||||
|
|
||||||
|
static struct PyModuleDef vimmodule;
|
||||||
|
|
||||||
|
! static PyObject *
|
||||||
|
! Py3Init_vim(void)
|
||||||
|
{
|
||||||
|
PyObject *mod;
|
||||||
|
PyObject *tmp;
|
||||||
|
***************
|
||||||
|
*** 1824,1830 ****
|
||||||
|
|
||||||
|
return mod;
|
||||||
|
}
|
||||||
|
- #endif
|
||||||
|
|
||||||
|
/*************************************************************************
|
||||||
|
* 4. Utility functions for handling the interface between Vim and Python.
|
||||||
|
--- 1824,1829 ----
|
||||||
|
*** ../vim-7.3.730/src/version.c 2012-11-28 15:25:28.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 15:30:47.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 731,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
90. Instead of calling you to dinner, your spouse sends e-mail.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
130
7.3.732
Normal file
130
7.3.732
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.732
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.732
|
||||||
|
Problem: Compiler warnings for function arguments.
|
||||||
|
Solution: Use inteptr_t instead of long.
|
||||||
|
Files: src/if_mzsch.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.731/src/if_mzsch.c 2012-10-14 03:41:54.000000000 +0200
|
||||||
|
--- src/if_mzsch.c 2012-11-24 14:00:31.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 142,148 ****
|
||||||
|
static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);
|
||||||
|
static void startup_mzscheme(void);
|
||||||
|
static char *string_to_line(Scheme_Object *obj);
|
||||||
|
! static void do_output(char *mesg, long len);
|
||||||
|
static void do_printf(char *format, ...);
|
||||||
|
static void do_flush(void);
|
||||||
|
static Scheme_Object *_apply_thunk_catch_exceptions(
|
||||||
|
--- 142,148 ----
|
||||||
|
static int do_mzscheme_command(exarg_T *, void *, Scheme_Closed_Prim *what);
|
||||||
|
static void startup_mzscheme(void);
|
||||||
|
static char *string_to_line(Scheme_Object *obj);
|
||||||
|
! static void do_output(char *mesg, intptr_t len);
|
||||||
|
static void do_printf(char *format, ...);
|
||||||
|
static void do_flush(void);
|
||||||
|
static Scheme_Object *_apply_thunk_catch_exceptions(
|
||||||
|
***************
|
||||||
|
*** 1349,1356 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
! do_output(char *mesg, long len UNUSED)
|
||||||
|
{
|
||||||
|
do_intrnl_output(mesg, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 1349,1357 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
! do_output(char *mesg, intptr_t len UNUSED)
|
||||||
|
{
|
||||||
|
+ /* TODO: use len, the string may not be NUL terminated */
|
||||||
|
do_intrnl_output(mesg, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1370,1376 ****
|
||||||
|
do_flush(void)
|
||||||
|
{
|
||||||
|
char *buff;
|
||||||
|
! long length;
|
||||||
|
|
||||||
|
buff = scheme_get_sized_string_output(curerr, &length);
|
||||||
|
MZ_GC_CHECK();
|
||||||
|
--- 1371,1377 ----
|
||||||
|
do_flush(void)
|
||||||
|
{
|
||||||
|
char *buff;
|
||||||
|
! intptr_t length;
|
||||||
|
|
||||||
|
buff = scheme_get_sized_string_output(curerr, &length);
|
||||||
|
MZ_GC_CHECK();
|
||||||
|
***************
|
||||||
|
*** 2588,2594 ****
|
||||||
|
{
|
||||||
|
char *scheme_str = NULL;
|
||||||
|
char *vim_str = NULL;
|
||||||
|
! long len;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
scheme_str = scheme_display_to_string(obj, &len);
|
||||||
|
--- 2589,2595 ----
|
||||||
|
{
|
||||||
|
char *scheme_str = NULL;
|
||||||
|
char *vim_str = NULL;
|
||||||
|
! intptr_t len;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
scheme_str = scheme_display_to_string(obj, &len);
|
||||||
|
***************
|
||||||
|
*** 2597,2606 ****
|
||||||
|
* are replacing a single line, and we must replace it with
|
||||||
|
* a single line.
|
||||||
|
*/
|
||||||
|
! if (memchr(scheme_str, '\n', len))
|
||||||
|
scheme_signal_error(_("string cannot contain newlines"));
|
||||||
|
|
||||||
|
! vim_str = (char *)alloc(len + 1);
|
||||||
|
|
||||||
|
/* Create a copy of the string, with internal nulls replaced by
|
||||||
|
* newline characters, as is the vim convention.
|
||||||
|
--- 2598,2607 ----
|
||||||
|
* are replacing a single line, and we must replace it with
|
||||||
|
* a single line.
|
||||||
|
*/
|
||||||
|
! if (memchr(scheme_str, '\n', (size_t)len))
|
||||||
|
scheme_signal_error(_("string cannot contain newlines"));
|
||||||
|
|
||||||
|
! vim_str = (char *)alloc((int)(len + 1));
|
||||||
|
|
||||||
|
/* Create a copy of the string, with internal nulls replaced by
|
||||||
|
* newline characters, as is the vim convention.
|
||||||
|
*** ../vim-7.3.731/src/version.c 2012-11-28 15:33:10.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 15:34:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 732,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
91. It's Saturday afternoon in the middle of May and you
|
||||||
|
are on computer.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
118
7.3.733
Normal file
118
7.3.733
Normal file
@ -0,0 +1,118 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.733
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.733
|
||||||
|
Problem: Tests fail when including MzScheme.
|
||||||
|
Solution: Change #ifdefs for vim_main2().
|
||||||
|
Files: src/main.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.732/src/main.c 2012-04-25 18:24:24.000000000 +0200
|
||||||
|
--- src/main.c 2012-11-24 14:26:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 147,154 ****
|
||||||
|
#define ME_INVALID_ARG 5
|
||||||
|
};
|
||||||
|
|
||||||
|
- #ifndef NO_VIM_MAIN /* skip this for unittests */
|
||||||
|
#ifndef PROTO /* don't want a prototype for main() */
|
||||||
|
int
|
||||||
|
# ifdef VIMDLL
|
||||||
|
_export
|
||||||
|
--- 147,154 ----
|
||||||
|
#define ME_INVALID_ARG 5
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifndef PROTO /* don't want a prototype for main() */
|
||||||
|
+ #ifndef NO_VIM_MAIN /* skip this for unittests */
|
||||||
|
int
|
||||||
|
# ifdef VIMDLL
|
||||||
|
_export
|
||||||
|
***************
|
||||||
|
*** 570,584 ****
|
||||||
|
return mzscheme_main(2, args);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
! int vim_main2(int argc, char **argv)
|
||||||
|
{
|
||||||
|
char_u *fname = (char_u *)argv[0];
|
||||||
|
mparm_T params;
|
||||||
|
|
||||||
|
memcpy(¶ms, argv[1], sizeof(params));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Execute --cmd arguments. */
|
||||||
|
exe_pre_commands(¶ms);
|
||||||
|
|
||||||
|
--- 570,596 ----
|
||||||
|
return mzscheme_main(2, args);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ #endif
|
||||||
|
+ #endif /* NO_VIM_MAIN */
|
||||||
|
|
||||||
|
! /* vim_main2() needs to be produced when FEAT_MZSCHEME is defined even when
|
||||||
|
! * NO_VIM_MAIN is defined. */
|
||||||
|
! #ifdef FEAT_MZSCHEME
|
||||||
|
! int
|
||||||
|
! vim_main2(int argc UNUSED, char **argv UNUSED)
|
||||||
|
{
|
||||||
|
+ # ifndef NO_VIM_MAIN
|
||||||
|
char_u *fname = (char_u *)argv[0];
|
||||||
|
mparm_T params;
|
||||||
|
|
||||||
|
memcpy(¶ms, argv[1], sizeof(params));
|
||||||
|
+ # else
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ # endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ #ifndef NO_VIM_MAIN
|
||||||
|
/* Execute --cmd arguments. */
|
||||||
|
exe_pre_commands(¶ms);
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 999,1006 ****
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
- #endif /* PROTO */
|
||||||
|
#endif /* NO_VIM_MAIN */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main loop: Execute Normal mode commands until exiting Vim.
|
||||||
|
--- 1011,1018 ----
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif /* NO_VIM_MAIN */
|
||||||
|
+ #endif /* PROTO */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main loop: Execute Normal mode commands until exiting Vim.
|
||||||
|
*** ../vim-7.3.732/src/version.c 2012-11-28 15:37:46.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 15:54:07.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 733,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
:^[/ mean-smiley-with-cigarette
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
125
7.3.734
Normal file
125
7.3.734
Normal file
@ -0,0 +1,125 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.734
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.734
|
||||||
|
Problem: Cannot put help files in a sub-directory.
|
||||||
|
Solution: Make :helptags work for sub-directories. (Charles Campbell)
|
||||||
|
Files: src/ex_cmds.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.733/src/ex_cmds.c 2012-09-05 15:15:01.000000000 +0200
|
||||||
|
--- src/ex_cmds.c 2012-11-28 15:59:58.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 6344,6353 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef FEAT_MULTI_LANG
|
||||||
|
! /* Get a list of all files in the directory. */
|
||||||
|
STRCPY(NameBuff, dirname);
|
||||||
|
add_pathsep(NameBuff);
|
||||||
|
! STRCAT(NameBuff, "*");
|
||||||
|
if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
|
||||||
|
EW_FILE|EW_SILENT) == FAIL
|
||||||
|
|| filecount == 0)
|
||||||
|
--- 6344,6353 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef FEAT_MULTI_LANG
|
||||||
|
! /* Get a list of all files in the help directory and in subdirectories. */
|
||||||
|
STRCPY(NameBuff, dirname);
|
||||||
|
add_pathsep(NameBuff);
|
||||||
|
! STRCAT(NameBuff, "**");
|
||||||
|
if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
|
||||||
|
EW_FILE|EW_SILENT) == FAIL
|
||||||
|
|| filecount == 0)
|
||||||
|
***************
|
||||||
|
*** 6436,6443 ****
|
||||||
|
helptags_one(dir, ext, tagfname, add_help_tags)
|
||||||
|
char_u *dir; /* doc directory */
|
||||||
|
char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */
|
||||||
|
! char_u *tagfname; /* "tags" for English, "tags-fr" for French. */
|
||||||
|
! int add_help_tags; /* add "help-tags" tag */
|
||||||
|
{
|
||||||
|
FILE *fd_tags;
|
||||||
|
FILE *fd;
|
||||||
|
--- 6436,6443 ----
|
||||||
|
helptags_one(dir, ext, tagfname, add_help_tags)
|
||||||
|
char_u *dir; /* doc directory */
|
||||||
|
char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */
|
||||||
|
! char_u *tagfname; /* "tags" for English, "tags-fr" for French. */
|
||||||
|
! int add_help_tags; /* add "help-tags" tag */
|
||||||
|
{
|
||||||
|
FILE *fd_tags;
|
||||||
|
FILE *fd;
|
||||||
|
***************
|
||||||
|
*** 6449,6454 ****
|
||||||
|
--- 6449,6455 ----
|
||||||
|
char_u *s;
|
||||||
|
int i;
|
||||||
|
char_u *fname;
|
||||||
|
+ int dirlen;
|
||||||
|
# ifdef FEAT_MBYTE
|
||||||
|
int utf8 = MAYBE;
|
||||||
|
int this_utf8;
|
||||||
|
***************
|
||||||
|
*** 6459,6467 ****
|
||||||
|
/*
|
||||||
|
* Find all *.txt files.
|
||||||
|
*/
|
||||||
|
STRCPY(NameBuff, dir);
|
||||||
|
! add_pathsep(NameBuff);
|
||||||
|
! STRCAT(NameBuff, "*");
|
||||||
|
STRCAT(NameBuff, ext);
|
||||||
|
if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
|
||||||
|
EW_FILE|EW_SILENT) == FAIL
|
||||||
|
--- 6460,6468 ----
|
||||||
|
/*
|
||||||
|
* Find all *.txt files.
|
||||||
|
*/
|
||||||
|
+ dirlen = STRLEN(dir);
|
||||||
|
STRCPY(NameBuff, dir);
|
||||||
|
! STRCAT(NameBuff, "/**/*");
|
||||||
|
STRCAT(NameBuff, ext);
|
||||||
|
if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
|
||||||
|
EW_FILE|EW_SILENT) == FAIL
|
||||||
|
***************
|
||||||
|
*** 6522,6528 ****
|
||||||
|
EMSG2(_("E153: Unable to open %s for reading"), files[fi]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
! fname = gettail(files[fi]);
|
||||||
|
|
||||||
|
# ifdef FEAT_MBYTE
|
||||||
|
firstline = TRUE;
|
||||||
|
--- 6523,6529 ----
|
||||||
|
EMSG2(_("E153: Unable to open %s for reading"), files[fi]);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
! fname = files[fi] + dirlen + 1;
|
||||||
|
|
||||||
|
# ifdef FEAT_MBYTE
|
||||||
|
firstline = TRUE;
|
||||||
|
*** ../vim-7.3.733/src/version.c 2012-11-28 15:55:37.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 15:58:26.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 734,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
y:-) Bad toupee
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
100
7.3.735
Normal file
100
7.3.735
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.735
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.735
|
||||||
|
Problem: Cannot build Ruby 1.9 with MingW or Cygwin.
|
||||||
|
Solution: Add another include directory. (Ken Takata)
|
||||||
|
Files: src/Make_cyg.mak, src/Make_ming.mak
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.734/src/Make_cyg.mak 2012-07-06 13:40:44.000000000 +0200
|
||||||
|
--- src/Make_cyg.mak 2012-11-28 16:14:41.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 21,27 ****
|
||||||
|
# TCL_VER define to version of TCL being used (83)
|
||||||
|
# DYNAMIC_TCL no or yes: use yes to load the TCL DLL dynamically (yes)
|
||||||
|
# RUBY define to path to Ruby dir to get Ruby support (not defined)
|
||||||
|
! # RUBY_VER define to version of Ruby being used (16)
|
||||||
|
# DYNAMIC_RUBY no or yes: use yes to load the Ruby DLL dynamically (yes)
|
||||||
|
# MZSCHEME define to path to MzScheme dir to get MZSCHEME support (not defined)
|
||||||
|
# MZSCHEME_VER define to version of MzScheme being used (209_000)
|
||||||
|
--- 21,31 ----
|
||||||
|
# TCL_VER define to version of TCL being used (83)
|
||||||
|
# DYNAMIC_TCL no or yes: use yes to load the TCL DLL dynamically (yes)
|
||||||
|
# RUBY define to path to Ruby dir to get Ruby support (not defined)
|
||||||
|
! # RUBY_VER define to version of Ruby being used (16)
|
||||||
|
! # RUBY_VER_LONG same, but in format with dot. (1.6)
|
||||||
|
! # You must set RUBY_VER_LONG when changing RUBY_VER.
|
||||||
|
! # You must set RUBY_API_VER version to RUBY_VER_LONG.
|
||||||
|
! # Don't set ruby API version to RUBY_VER like 191.
|
||||||
|
# DYNAMIC_RUBY no or yes: use yes to load the Ruby DLL dynamically (yes)
|
||||||
|
# MZSCHEME define to path to MzScheme dir to get MZSCHEME support (not defined)
|
||||||
|
# MZSCHEME_VER define to version of MzScheme being used (209_000)
|
||||||
|
***************
|
||||||
|
*** 217,224 ****
|
||||||
|
--- 221,235 ----
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
+ ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
|
||||||
|
+ RUBY_19_OR_LATER = 1
|
||||||
|
+ endif
|
||||||
|
+
|
||||||
|
DEFINES += -DFEAT_RUBY
|
||||||
|
INCLUDES += -I$(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
|
||||||
|
+ ifdef RUBY_19_OR_LATER
|
||||||
|
+ INCLUDES += -I$(RUBY)/include/ruby-$(RUBY_VER_LONG) -I$(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
|
||||||
|
+ endif
|
||||||
|
EXTRA_OBJS += $(OUTDIR)/if_ruby.o
|
||||||
|
|
||||||
|
ifeq (yes, $(DYNAMIC_RUBY))
|
||||||
|
*** ../vim-7.3.734/src/Make_ming.mak 2012-09-05 17:57:34.000000000 +0200
|
||||||
|
--- src/Make_ming.mak 2012-11-28 16:14:16.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 301,307 ****
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
! RUBYINC =-I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
|
||||||
|
ifeq (no, $(DYNAMIC_RUBY))
|
||||||
|
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
|
||||||
|
endif
|
||||||
|
--- 301,314 ----
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
! ifeq (19, $(word 1,$(sort 19 $(RUBY_VER))))
|
||||||
|
! RUBY_19_OR_LATER = 1
|
||||||
|
! endif
|
||||||
|
!
|
||||||
|
! RUBYINC = -I $(RUBY)/lib/ruby/$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
|
||||||
|
! ifdef RUBY_19_OR_LATER
|
||||||
|
! RUBYINC += -I $(RUBY)/include/ruby-$(RUBY_VER_LONG) -I $(RUBY)/include/ruby-$(RUBY_VER_LONG)/$(RUBY_PLATFORM)
|
||||||
|
! endif
|
||||||
|
ifeq (no, $(DYNAMIC_RUBY))
|
||||||
|
RUBYLIB = -L$(RUBY)/lib -l$(RUBY_INSTALL_NAME)
|
||||||
|
endif
|
||||||
|
*** ../vim-7.3.734/src/version.c 2012-11-28 16:06:13.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 16:16:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 735,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
:----} You lie like Pinocchio
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
258
7.3.736
Normal file
258
7.3.736
Normal file
@ -0,0 +1,258 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.736
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.736
|
||||||
|
Problem: File name completion in input() escapes white space. (Frederic
|
||||||
|
Hardy)
|
||||||
|
Solution: Do not escape white space. (Christian Brabandt)
|
||||||
|
Files: src/ex_getln.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.735/src/ex_getln.c 2012-10-11 04:04:32.000000000 +0200
|
||||||
|
--- src/ex_getln.c 2012-11-28 16:42:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 102,108 ****
|
||||||
|
static void redrawcmdprompt __ARGS((void));
|
||||||
|
static void cursorcmd __ARGS((void));
|
||||||
|
static int ccheck_abbr __ARGS((int));
|
||||||
|
! static int nextwild __ARGS((expand_T *xp, int type, int options));
|
||||||
|
static void escape_fname __ARGS((char_u **pp));
|
||||||
|
static int showmatches __ARGS((expand_T *xp, int wildmenu));
|
||||||
|
static void set_expand_context __ARGS((expand_T *xp));
|
||||||
|
--- 102,108 ----
|
||||||
|
static void redrawcmdprompt __ARGS((void));
|
||||||
|
static void cursorcmd __ARGS((void));
|
||||||
|
static int ccheck_abbr __ARGS((int));
|
||||||
|
! static int nextwild __ARGS((expand_T *xp, int type, int options, int escape));
|
||||||
|
static void escape_fname __ARGS((char_u **pp));
|
||||||
|
static int showmatches __ARGS((expand_T *xp, int wildmenu));
|
||||||
|
static void set_expand_context __ARGS((expand_T *xp));
|
||||||
|
***************
|
||||||
|
*** 810,818 ****
|
||||||
|
did_wild_list = TRUE;
|
||||||
|
}
|
||||||
|
if (wim_flags[wim_index] & WIM_LONGEST)
|
||||||
|
! res = nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP);
|
||||||
|
else if (wim_flags[wim_index] & WIM_FULL)
|
||||||
|
! res = nextwild(&xpc, WILD_NEXT, WILD_NO_BEEP);
|
||||||
|
else
|
||||||
|
res = OK; /* don't insert 'wildchar' now */
|
||||||
|
}
|
||||||
|
--- 810,820 ----
|
||||||
|
did_wild_list = TRUE;
|
||||||
|
}
|
||||||
|
if (wim_flags[wim_index] & WIM_LONGEST)
|
||||||
|
! res = nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP,
|
||||||
|
! firstc != '@');
|
||||||
|
else if (wim_flags[wim_index] & WIM_FULL)
|
||||||
|
! res = nextwild(&xpc, WILD_NEXT, WILD_NO_BEEP,
|
||||||
|
! firstc != '@');
|
||||||
|
else
|
||||||
|
res = OK; /* don't insert 'wildchar' now */
|
||||||
|
}
|
||||||
|
***************
|
||||||
|
*** 823,831 ****
|
||||||
|
/* if 'wildmode' first contains "longest", get longest
|
||||||
|
* common part */
|
||||||
|
if (wim_flags[0] & WIM_LONGEST)
|
||||||
|
! res = nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP);
|
||||||
|
else
|
||||||
|
! res = nextwild(&xpc, WILD_EXPAND_KEEP, WILD_NO_BEEP);
|
||||||
|
|
||||||
|
/* if interrupted while completing, behave like it failed */
|
||||||
|
if (got_int)
|
||||||
|
--- 825,835 ----
|
||||||
|
/* if 'wildmode' first contains "longest", get longest
|
||||||
|
* common part */
|
||||||
|
if (wim_flags[0] & WIM_LONGEST)
|
||||||
|
! res = nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP,
|
||||||
|
! firstc != '@');
|
||||||
|
else
|
||||||
|
! res = nextwild(&xpc, WILD_EXPAND_KEEP, WILD_NO_BEEP,
|
||||||
|
! firstc != '@');
|
||||||
|
|
||||||
|
/* if interrupted while completing, behave like it failed */
|
||||||
|
if (got_int)
|
||||||
|
***************
|
||||||
|
*** 860,866 ****
|
||||||
|
int p_wmnu_save = p_wmnu;
|
||||||
|
p_wmnu = 0;
|
||||||
|
#endif
|
||||||
|
! nextwild(&xpc, WILD_PREV, 0); /* remove match */
|
||||||
|
#ifdef FEAT_WILDMENU
|
||||||
|
p_wmnu = p_wmnu_save;
|
||||||
|
#endif
|
||||||
|
--- 864,871 ----
|
||||||
|
int p_wmnu_save = p_wmnu;
|
||||||
|
p_wmnu = 0;
|
||||||
|
#endif
|
||||||
|
! /* remove match */
|
||||||
|
! nextwild(&xpc, WILD_PREV, 0, firstc != '@');
|
||||||
|
#ifdef FEAT_WILDMENU
|
||||||
|
p_wmnu = p_wmnu_save;
|
||||||
|
#endif
|
||||||
|
***************
|
||||||
|
*** 874,882 ****
|
||||||
|
redrawcmd();
|
||||||
|
did_wild_list = TRUE;
|
||||||
|
if (wim_flags[wim_index] & WIM_LONGEST)
|
||||||
|
! nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP);
|
||||||
|
else if (wim_flags[wim_index] & WIM_FULL)
|
||||||
|
! nextwild(&xpc, WILD_NEXT, WILD_NO_BEEP);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
vim_beep();
|
||||||
|
--- 879,889 ----
|
||||||
|
redrawcmd();
|
||||||
|
did_wild_list = TRUE;
|
||||||
|
if (wim_flags[wim_index] & WIM_LONGEST)
|
||||||
|
! nextwild(&xpc, WILD_LONGEST, WILD_NO_BEEP,
|
||||||
|
! firstc != '@');
|
||||||
|
else if (wim_flags[wim_index] & WIM_FULL)
|
||||||
|
! nextwild(&xpc, WILD_NEXT, WILD_NO_BEEP,
|
||||||
|
! firstc != '@');
|
||||||
|
}
|
||||||
|
else
|
||||||
|
vim_beep();
|
||||||
|
***************
|
||||||
|
*** 899,907 ****
|
||||||
|
/* <S-Tab> goes to last match, in a clumsy way */
|
||||||
|
if (c == K_S_TAB && KeyTyped)
|
||||||
|
{
|
||||||
|
! if (nextwild(&xpc, WILD_EXPAND_KEEP, 0) == OK
|
||||||
|
! && nextwild(&xpc, WILD_PREV, 0) == OK
|
||||||
|
! && nextwild(&xpc, WILD_PREV, 0) == OK)
|
||||||
|
goto cmdline_changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 906,914 ----
|
||||||
|
/* <S-Tab> goes to last match, in a clumsy way */
|
||||||
|
if (c == K_S_TAB && KeyTyped)
|
||||||
|
{
|
||||||
|
! if (nextwild(&xpc, WILD_EXPAND_KEEP, 0, firstc != '@') == OK
|
||||||
|
! && nextwild(&xpc, WILD_PREV, 0, firstc != '@') == OK
|
||||||
|
! && nextwild(&xpc, WILD_PREV, 0, firstc != '@') == OK)
|
||||||
|
goto cmdline_changed;
|
||||||
|
}
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1418,1424 ****
|
||||||
|
goto cmdline_not_changed;
|
||||||
|
|
||||||
|
case Ctrl_A: /* all matches */
|
||||||
|
! if (nextwild(&xpc, WILD_ALL, 0) == FAIL)
|
||||||
|
break;
|
||||||
|
goto cmdline_changed;
|
||||||
|
|
||||||
|
--- 1425,1431 ----
|
||||||
|
goto cmdline_not_changed;
|
||||||
|
|
||||||
|
case Ctrl_A: /* all matches */
|
||||||
|
! if (nextwild(&xpc, WILD_ALL, 0, firstc != '@') == FAIL)
|
||||||
|
break;
|
||||||
|
goto cmdline_changed;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1454,1460 ****
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* completion: longest common part */
|
||||||
|
! if (nextwild(&xpc, WILD_LONGEST, 0) == FAIL)
|
||||||
|
break;
|
||||||
|
goto cmdline_changed;
|
||||||
|
|
||||||
|
--- 1461,1467 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* completion: longest common part */
|
||||||
|
! if (nextwild(&xpc, WILD_LONGEST, 0, firstc != '@') == FAIL)
|
||||||
|
break;
|
||||||
|
goto cmdline_changed;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1462,1469 ****
|
||||||
|
case Ctrl_P: /* previous match */
|
||||||
|
if (xpc.xp_numfiles > 0)
|
||||||
|
{
|
||||||
|
! if (nextwild(&xpc, (c == Ctrl_P) ? WILD_PREV : WILD_NEXT, 0)
|
||||||
|
! == FAIL)
|
||||||
|
break;
|
||||||
|
goto cmdline_changed;
|
||||||
|
}
|
||||||
|
--- 1469,1476 ----
|
||||||
|
case Ctrl_P: /* previous match */
|
||||||
|
if (xpc.xp_numfiles > 0)
|
||||||
|
{
|
||||||
|
! if (nextwild(&xpc, (c == Ctrl_P) ? WILD_PREV : WILD_NEXT,
|
||||||
|
! 0, firstc != '@') == FAIL)
|
||||||
|
break;
|
||||||
|
goto cmdline_changed;
|
||||||
|
}
|
||||||
|
***************
|
||||||
|
*** 3338,3347 ****
|
||||||
|
* normal character (instead of being expanded). This allows :s/^I^D etc.
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
! nextwild(xp, type, options)
|
||||||
|
expand_T *xp;
|
||||||
|
int type;
|
||||||
|
int options; /* extra options for ExpandOne() */
|
||||||
|
{
|
||||||
|
int i, j;
|
||||||
|
char_u *p1;
|
||||||
|
--- 3345,3355 ----
|
||||||
|
* normal character (instead of being expanded). This allows :s/^I^D etc.
|
||||||
|
*/
|
||||||
|
static int
|
||||||
|
! nextwild(xp, type, options, escape)
|
||||||
|
expand_T *xp;
|
||||||
|
int type;
|
||||||
|
int options; /* extra options for ExpandOne() */
|
||||||
|
+ int escape; /* if TRUE, escape the returned matches */
|
||||||
|
{
|
||||||
|
int i, j;
|
||||||
|
char_u *p1;
|
||||||
|
***************
|
||||||
|
*** 3390,3396 ****
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int use_options = options |
|
||||||
|
! WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT|WILD_ESCAPE;
|
||||||
|
|
||||||
|
if (p_wic)
|
||||||
|
use_options += WILD_ICASE;
|
||||||
|
--- 3398,3406 ----
|
||||||
|
else
|
||||||
|
{
|
||||||
|
int use_options = options |
|
||||||
|
! WILD_HOME_REPLACE|WILD_ADD_SLASH|WILD_SILENT;
|
||||||
|
! if (escape)
|
||||||
|
! use_options |= WILD_ESCAPE;
|
||||||
|
|
||||||
|
if (p_wic)
|
||||||
|
use_options += WILD_ICASE;
|
||||||
|
*** ../vim-7.3.735/src/version.c 2012-11-28 16:18:26.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 16:30:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 736,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
;-0 Can't find shift key
|
||||||
|
,-9 Kann Umschalttaste nicht finden
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
49
7.3.737
Normal file
49
7.3.737
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.737
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.737
|
||||||
|
Problem: When using do_cmdline() recursively did_endif is not reset,
|
||||||
|
causing messages to be overwritten.
|
||||||
|
Solution: Reset did_endif. (Christian Brabandt)
|
||||||
|
Files: src/ex_docmd.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.736/src/ex_docmd.c 2012-10-03 18:24:55.000000000 +0200
|
||||||
|
--- src/ex_docmd.c 2012-11-28 17:25:27.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1536,1541 ****
|
||||||
|
--- 1536,1543 ----
|
||||||
|
if_level = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+ did_endif = FALSE; /* in case do_cmdline used recursively */
|
||||||
|
+
|
||||||
|
--call_depth;
|
||||||
|
return retval;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.736/src/version.c 2012-11-28 16:49:53.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 17:33:54.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 737,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
:-) Funny
|
||||||
|
|-) Funny Oriental
|
||||||
|
(-: Funny Australian
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
142
7.3.738
Normal file
142
7.3.738
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.738
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.738 (after 7.3.730)
|
||||||
|
Problem: Unused function argument.
|
||||||
|
Solution: Remove it. (Christian Brabandt)
|
||||||
|
Files: src/quickfix.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.737/src/quickfix.c 2012-11-28 15:25:28.000000000 +0100
|
||||||
|
--- src/quickfix.c 2012-11-28 17:36:26.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 107,113 ****
|
||||||
|
};
|
||||||
|
|
||||||
|
static int qf_init_ext __ARGS((qf_info_T *qi, char_u *efile, buf_T *buf, typval_T *tv, char_u *errorformat, int newlist, linenr_T lnumfirst, linenr_T lnumlast, char_u *qf_title));
|
||||||
|
! static void qf_new_list __ARGS((qf_info_T *qi, char_u *qf_title, win_T *wp));
|
||||||
|
static void ll_free_all __ARGS((qf_info_T **pqi));
|
||||||
|
static int qf_add_entry __ARGS((qf_info_T *qi, qfline_T **prevp, char_u *dir, char_u *fname, int bufnum, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid));
|
||||||
|
static qf_info_T *ll_new_list __ARGS((void));
|
||||||
|
--- 107,113 ----
|
||||||
|
};
|
||||||
|
|
||||||
|
static int qf_init_ext __ARGS((qf_info_T *qi, char_u *efile, buf_T *buf, typval_T *tv, char_u *errorformat, int newlist, linenr_T lnumfirst, linenr_T lnumlast, char_u *qf_title));
|
||||||
|
! static void qf_new_list __ARGS((qf_info_T *qi, char_u *qf_title));
|
||||||
|
static void ll_free_all __ARGS((qf_info_T **pqi));
|
||||||
|
static int qf_add_entry __ARGS((qf_info_T *qi, qfline_T **prevp, char_u *dir, char_u *fname, int bufnum, char_u *mesg, long lnum, int col, int vis_col, char_u *pattern, int nr, int type, int valid));
|
||||||
|
static qf_info_T *ll_new_list __ARGS((void));
|
||||||
|
***************
|
||||||
|
*** 266,272 ****
|
||||||
|
|
||||||
|
if (newlist || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, qf_title, curwin);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (qfprev = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
--- 266,272 ----
|
||||||
|
|
||||||
|
if (newlist || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, qf_title);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (qfprev = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
***************
|
||||||
|
*** 885,894 ****
|
||||||
|
* Prepare for adding a new quickfix list.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
! qf_new_list(qi, qf_title, wp)
|
||||||
|
qf_info_T *qi;
|
||||||
|
char_u *qf_title;
|
||||||
|
- win_T *wp;
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
--- 885,893 ----
|
||||||
|
* Prepare for adding a new quickfix list.
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
! qf_new_list(qi, qf_title)
|
||||||
|
qf_info_T *qi;
|
||||||
|
char_u *qf_title;
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 3187,3193 ****
|
||||||
|
eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
|
||||||
|
|| qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep, curwin);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
--- 3186,3192 ----
|
||||||
|
eap->cmdidx != CMD_vimgrepadd && eap->cmdidx != CMD_lvimgrepadd)
|
||||||
|
|| qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep);
|
||||||
|
else if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
***************
|
||||||
|
*** 3753,3759 ****
|
||||||
|
|
||||||
|
if (action == ' ' || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, title, wp);
|
||||||
|
else if (action == 'a' && qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
--- 3752,3758 ----
|
||||||
|
|
||||||
|
if (action == ' ' || qi->qf_curlist == qi->qf_listcount)
|
||||||
|
/* make place for a new list */
|
||||||
|
! qf_new_list(qi, title);
|
||||||
|
else if (action == 'a' && qi->qf_lists[qi->qf_curlist].qf_count > 0)
|
||||||
|
/* Adding to existing list, find last entry. */
|
||||||
|
for (prevp = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
***************
|
||||||
|
*** 4035,4041 ****
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* create a new quickfix list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep, wp);
|
||||||
|
|
||||||
|
/* Go through all directories in 'runtimepath' */
|
||||||
|
p = p_rtp;
|
||||||
|
--- 4034,4040 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* create a new quickfix list */
|
||||||
|
! qf_new_list(qi, *eap->cmdlinep);
|
||||||
|
|
||||||
|
/* Go through all directories in 'runtimepath' */
|
||||||
|
p = p_rtp;
|
||||||
|
*** ../vim-7.3.737/src/version.c 2012-11-28 17:34:43.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 17:37:20.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 738,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
:-H Is missing teeth
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
86
7.3.739
Normal file
86
7.3.739
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.739
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.739
|
||||||
|
Problem: Computing number of lines may have an integer overflow.
|
||||||
|
Solution: Check for MAXCOL explicitly. (Dominique Pelle)
|
||||||
|
Files: src/move.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.738/src/move.c 2012-03-28 14:19:46.000000000 +0200
|
||||||
|
--- src/move.c 2012-11-28 18:15:42.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2576,2582 ****
|
||||||
|
else
|
||||||
|
topline_back(lp);
|
||||||
|
h2 = lp->height;
|
||||||
|
! if (h2 + h1 > min_height)
|
||||||
|
{
|
||||||
|
*lp = loff0; /* no overlap */
|
||||||
|
return;
|
||||||
|
--- 2576,2582 ----
|
||||||
|
else
|
||||||
|
topline_back(lp);
|
||||||
|
h2 = lp->height;
|
||||||
|
! if (h2 == MAXCOL || h2 + h1 > min_height)
|
||||||
|
{
|
||||||
|
*lp = loff0; /* no overlap */
|
||||||
|
return;
|
||||||
|
***************
|
||||||
|
*** 2588,2594 ****
|
||||||
|
else
|
||||||
|
topline_back(lp);
|
||||||
|
h3 = lp->height;
|
||||||
|
! if (h3 + h2 > min_height)
|
||||||
|
{
|
||||||
|
*lp = loff0; /* no overlap */
|
||||||
|
return;
|
||||||
|
--- 2588,2594 ----
|
||||||
|
else
|
||||||
|
topline_back(lp);
|
||||||
|
h3 = lp->height;
|
||||||
|
! if (h3 == MAXCOL || h3 + h2 > min_height)
|
||||||
|
{
|
||||||
|
*lp = loff0; /* no overlap */
|
||||||
|
return;
|
||||||
|
***************
|
||||||
|
*** 2600,2606 ****
|
||||||
|
else
|
||||||
|
topline_back(lp);
|
||||||
|
h4 = lp->height;
|
||||||
|
! if (h4 + h3 + h2 > min_height || h3 + h2 + h1 > min_height)
|
||||||
|
*lp = loff1; /* 1 line overlap */
|
||||||
|
else
|
||||||
|
*lp = loff2; /* 2 lines overlap */
|
||||||
|
--- 2600,2606 ----
|
||||||
|
else
|
||||||
|
topline_back(lp);
|
||||||
|
h4 = lp->height;
|
||||||
|
! if (h4 == MAXCOL || h4 + h3 + h2 > min_height || h3 + h2 + h1 > min_height)
|
||||||
|
*lp = loff1; /* 1 line overlap */
|
||||||
|
else
|
||||||
|
*lp = loff2; /* 2 lines overlap */
|
||||||
|
*** ../vim-7.3.738/src/version.c 2012-11-28 17:41:55.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 18:16:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 739,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
!-| I-am-a-Cylon-Centurian-with-one-red-eye-bouncing-back-and-forth
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
168
7.3.740
Normal file
168
7.3.740
Normal file
@ -0,0 +1,168 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.740
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.740
|
||||||
|
Problem: IOC tool complains about undefined behavior for int.
|
||||||
|
Solution: Change to unsigned int. (Dominique Pelle)
|
||||||
|
Files: src/hashtab.c, src/misc2.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.739/src/hashtab.c 2010-08-15 21:57:25.000000000 +0200
|
||||||
|
--- src/hashtab.c 2012-11-28 18:27:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 138,144 ****
|
||||||
|
hash_T perturb;
|
||||||
|
hashitem_T *freeitem;
|
||||||
|
hashitem_T *hi;
|
||||||
|
! int idx;
|
||||||
|
|
||||||
|
#ifdef HT_DEBUG
|
||||||
|
++hash_count_lookup;
|
||||||
|
--- 138,144 ----
|
||||||
|
hash_T perturb;
|
||||||
|
hashitem_T *freeitem;
|
||||||
|
hashitem_T *hi;
|
||||||
|
! unsigned idx;
|
||||||
|
|
||||||
|
#ifdef HT_DEBUG
|
||||||
|
++hash_count_lookup;
|
||||||
|
***************
|
||||||
|
*** 150,156 ****
|
||||||
|
* - skip over a removed item
|
||||||
|
* - return if the item matches
|
||||||
|
*/
|
||||||
|
! idx = (int)(hash & ht->ht_mask);
|
||||||
|
hi = &ht->ht_array[idx];
|
||||||
|
|
||||||
|
if (hi->hi_key == NULL)
|
||||||
|
--- 150,156 ----
|
||||||
|
* - skip over a removed item
|
||||||
|
* - return if the item matches
|
||||||
|
*/
|
||||||
|
! idx = (unsigned)(hash & ht->ht_mask);
|
||||||
|
hi = &ht->ht_array[idx];
|
||||||
|
|
||||||
|
if (hi->hi_key == NULL)
|
||||||
|
***************
|
||||||
|
*** 176,182 ****
|
||||||
|
#ifdef HT_DEBUG
|
||||||
|
++hash_count_perturb; /* count a "miss" for hashtab lookup */
|
||||||
|
#endif
|
||||||
|
! idx = (int)((idx << 2) + idx + perturb + 1);
|
||||||
|
hi = &ht->ht_array[idx & ht->ht_mask];
|
||||||
|
if (hi->hi_key == NULL)
|
||||||
|
return freeitem == NULL ? hi : freeitem;
|
||||||
|
--- 176,182 ----
|
||||||
|
#ifdef HT_DEBUG
|
||||||
|
++hash_count_perturb; /* count a "miss" for hashtab lookup */
|
||||||
|
#endif
|
||||||
|
! idx = (unsigned)((idx << 2U) + idx + perturb + 1U);
|
||||||
|
hi = &ht->ht_array[idx & ht->ht_mask];
|
||||||
|
if (hi->hi_key == NULL)
|
||||||
|
return freeitem == NULL ? hi : freeitem;
|
||||||
|
***************
|
||||||
|
*** 342,348 ****
|
||||||
|
hashitem_T temparray[HT_INIT_SIZE];
|
||||||
|
hashitem_T *oldarray, *newarray;
|
||||||
|
hashitem_T *olditem, *newitem;
|
||||||
|
! int newi;
|
||||||
|
int todo;
|
||||||
|
long_u oldsize, newsize;
|
||||||
|
long_u minsize;
|
||||||
|
--- 342,348 ----
|
||||||
|
hashitem_T temparray[HT_INIT_SIZE];
|
||||||
|
hashitem_T *oldarray, *newarray;
|
||||||
|
hashitem_T *olditem, *newitem;
|
||||||
|
! unsigned newi;
|
||||||
|
int todo;
|
||||||
|
long_u oldsize, newsize;
|
||||||
|
long_u minsize;
|
||||||
|
***************
|
||||||
|
*** 448,460 ****
|
||||||
|
* the algorithm to find an item in hash_lookup(). But we only
|
||||||
|
* need to search for a NULL key, thus it's simpler.
|
||||||
|
*/
|
||||||
|
! newi = (int)(olditem->hi_hash & newmask);
|
||||||
|
newitem = &newarray[newi];
|
||||||
|
|
||||||
|
if (newitem->hi_key != NULL)
|
||||||
|
for (perturb = olditem->hi_hash; ; perturb >>= PERTURB_SHIFT)
|
||||||
|
{
|
||||||
|
! newi = (int)((newi << 2) + newi + perturb + 1);
|
||||||
|
newitem = &newarray[newi & newmask];
|
||||||
|
if (newitem->hi_key == NULL)
|
||||||
|
break;
|
||||||
|
--- 448,460 ----
|
||||||
|
* the algorithm to find an item in hash_lookup(). But we only
|
||||||
|
* need to search for a NULL key, thus it's simpler.
|
||||||
|
*/
|
||||||
|
! newi = (unsigned)(olditem->hi_hash & newmask);
|
||||||
|
newitem = &newarray[newi];
|
||||||
|
|
||||||
|
if (newitem->hi_key != NULL)
|
||||||
|
for (perturb = olditem->hi_hash; ; perturb >>= PERTURB_SHIFT)
|
||||||
|
{
|
||||||
|
! newi = (unsigned)((newi << 2U) + newi + perturb + 1U);
|
||||||
|
newitem = &newarray[newi & newmask];
|
||||||
|
if (newitem->hi_key == NULL)
|
||||||
|
break;
|
||||||
|
*** ../vim-7.3.739/src/misc2.c 2012-08-15 16:20:59.000000000 +0200
|
||||||
|
--- src/misc2.c 2012-11-28 18:27:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3860,3866 ****
|
||||||
|
ush temp; \
|
||||||
|
\
|
||||||
|
temp = (ush)keys[2] | 2; \
|
||||||
|
! t = (int)(((unsigned)(temp * (temp ^ 1)) >> 8) & 0xff); \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- 3860,3866 ----
|
||||||
|
ush temp; \
|
||||||
|
\
|
||||||
|
temp = (ush)keys[2] | 2; \
|
||||||
|
! t = (int)(((unsigned)(temp * (temp ^ 1U)) >> 8) & 0xff); \
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
***************
|
||||||
|
*** 4002,4008 ****
|
||||||
|
ush temp;
|
||||||
|
|
||||||
|
temp = (ush)keys[2] | 2;
|
||||||
|
! temp = (int)(((unsigned)(temp * (temp ^ 1)) >> 8) & 0xff);
|
||||||
|
UPDATE_KEYS_ZIP(*p ^= temp);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
--- 4002,4008 ----
|
||||||
|
ush temp;
|
||||||
|
|
||||||
|
temp = (ush)keys[2] | 2;
|
||||||
|
! temp = (int)(((unsigned)(temp * (temp ^ 1U)) >> 8) & 0xff);
|
||||||
|
UPDATE_KEYS_ZIP(*p ^= temp);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
*** ../vim-7.3.739/src/version.c 2012-11-28 18:22:04.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 18:28:00.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 740,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
~#:-( I just washed my hair, and I can't do nuthin' with it.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
56
7.3.741
Normal file
56
7.3.741
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.741
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.741 (after 7.3.737)
|
||||||
|
Problem: Tiny build fails.
|
||||||
|
Solution: Move #ifdef. (Ike Devolder)
|
||||||
|
Files: src/ex_docmd.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.740/src/ex_docmd.c 2012-11-28 17:34:43.000000000 +0100
|
||||||
|
--- src/ex_docmd.c 2012-11-28 19:09:39.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1534,1542 ****
|
||||||
|
* ":endif" (could be ":if x | foo | endif").
|
||||||
|
*/
|
||||||
|
if_level = 0;
|
||||||
|
- #endif
|
||||||
|
|
||||||
|
did_endif = FALSE; /* in case do_cmdline used recursively */
|
||||||
|
|
||||||
|
--call_depth;
|
||||||
|
return retval;
|
||||||
|
--- 1534,1542 ----
|
||||||
|
* ":endif" (could be ":if x | foo | endif").
|
||||||
|
*/
|
||||||
|
if_level = 0;
|
||||||
|
|
||||||
|
did_endif = FALSE; /* in case do_cmdline used recursively */
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
--call_depth;
|
||||||
|
return retval;
|
||||||
|
*** ../vim-7.3.740/src/version.c 2012-11-28 18:31:49.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 19:09:15.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 741,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
:-O>-o Smiley American tourist (note big mouth and camera)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
44
7.3.742
Normal file
44
7.3.742
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.742
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.742
|
||||||
|
Problem: Leaking memory when :vimgrep restores the directory.
|
||||||
|
Solution: Free the allocated memory. (Christian Brabandt)
|
||||||
|
Files: src/quickfix.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.741/src/quickfix.c 2012-11-28 17:41:55.000000000 +0100
|
||||||
|
--- src/quickfix.c 2012-11-28 22:09:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3515,3520 ****
|
||||||
|
--- 3515,3521 ----
|
||||||
|
ea.cmdidx = (curwin->w_localdir == NULL) ? CMD_cd : CMD_lcd;
|
||||||
|
ex_cd(&ea);
|
||||||
|
}
|
||||||
|
+ vim_free(dirname_now);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
*** ../vim-7.3.741/src/version.c 2012-11-28 19:10:51.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 22:11:50.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 742,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
How many light bulbs does it take to change a person?
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
66
7.3.743
Normal file
66
7.3.743
Normal file
@ -0,0 +1,66 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.743
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.743 (after 7.3.741)
|
||||||
|
Problem: Tiny build still fails.
|
||||||
|
Solution: Add #else in the right place.
|
||||||
|
Files: src/ex_docmd.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.742/src/ex_docmd.c 2012-11-28 19:10:51.000000000 +0100
|
||||||
|
--- src/ex_docmd.c 2012-11-28 22:14:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1528,1541 ****
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
! #ifndef FEAT_EVAL
|
||||||
|
/*
|
||||||
|
* Reset if_level, in case a sourced script file contains more ":if" than
|
||||||
|
* ":endif" (could be ":if x | foo | endif").
|
||||||
|
*/
|
||||||
|
if_level = 0;
|
||||||
|
-
|
||||||
|
- did_endif = FALSE; /* in case do_cmdline used recursively */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--call_depth;
|
||||||
|
--- 1528,1541 ----
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
! #ifdef FEAT_EVAL
|
||||||
|
! did_endif = FALSE; /* in case do_cmdline used recursively */
|
||||||
|
! #else
|
||||||
|
/*
|
||||||
|
* Reset if_level, in case a sourced script file contains more ":if" than
|
||||||
|
* ":endif" (could be ":if x | foo | endif").
|
||||||
|
*/
|
||||||
|
if_level = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--call_depth;
|
||||||
|
*** ../vim-7.3.742/src/version.c 2012-11-28 22:12:40.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-28 22:15:15.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 743,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
:-)-O Smiling doctor with stethoscope
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
52
7.3.744
Normal file
52
7.3.744
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.744
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.744
|
||||||
|
Problem: 64 bit compiler warning.
|
||||||
|
Solution: Add type cast. (Mike Williams)
|
||||||
|
Files: src/ex_cmds.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.743/src/ex_cmds.c 2012-11-28 16:06:13.000000000 +0100
|
||||||
|
--- src/ex_cmds.c 2012-11-29 20:08:10.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 6460,6466 ****
|
||||||
|
/*
|
||||||
|
* Find all *.txt files.
|
||||||
|
*/
|
||||||
|
! dirlen = STRLEN(dir);
|
||||||
|
STRCPY(NameBuff, dir);
|
||||||
|
STRCAT(NameBuff, "/**/*");
|
||||||
|
STRCAT(NameBuff, ext);
|
||||||
|
--- 6460,6466 ----
|
||||||
|
/*
|
||||||
|
* Find all *.txt files.
|
||||||
|
*/
|
||||||
|
! dirlen = (int)STRLEN(dir);
|
||||||
|
STRCPY(NameBuff, dir);
|
||||||
|
STRCAT(NameBuff, "/**/*");
|
||||||
|
STRCAT(NameBuff, ext);
|
||||||
|
*** ../vim-7.3.743/src/version.c 2012-11-28 23:03:02.000000000 +0100
|
||||||
|
--- src/version.c 2012-11-29 20:08:37.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 744,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
From "know your smileys":
|
||||||
|
*<|:-) Santa Claus (Ho Ho Ho)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
87
7.3.745
Normal file
87
7.3.745
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.745
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.745
|
||||||
|
Problem: Automatically setting 'ttymouse' doesn't work.
|
||||||
|
Solution: Reset the "option was set" flag when using the default.
|
||||||
|
Files: src/option.c, src/proto/option.pro, src/term.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.744/src/option.c 2012-10-21 03:45:57.000000000 +0200
|
||||||
|
--- src/option.c 2012-12-03 20:07:32.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 11179,11184 ****
|
||||||
|
--- 11179,11197 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * Reset the flag indicating option "name" was set.
|
||||||
|
+ */
|
||||||
|
+ void
|
||||||
|
+ reset_option_was_set(name)
|
||||||
|
+ char_u *name;
|
||||||
|
+ {
|
||||||
|
+ int idx = findoption(name);
|
||||||
|
+
|
||||||
|
+ if (idx >= 0)
|
||||||
|
+ options[idx].flags &= ~P_WAS_SET;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
* compatible_set() - Called when 'compatible' has been set or unset.
|
||||||
|
*
|
||||||
|
* When 'compatible' set: Set all relevant options (those that have the P_VIM)
|
||||||
|
*** ../vim-7.3.744/src/proto/option.pro 2012-10-21 00:10:29.000000000 +0200
|
||||||
|
--- src/proto/option.pro 2012-12-03 20:08:36.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 52,57 ****
|
||||||
|
--- 52,58 ----
|
||||||
|
void vimrc_found __ARGS((char_u *fname, char_u *envname));
|
||||||
|
void change_compatible __ARGS((int on));
|
||||||
|
int option_was_set __ARGS((char_u *name));
|
||||||
|
+ void reset_option_was_set __ARGS((char_u *name));
|
||||||
|
int can_bs __ARGS((int what));
|
||||||
|
void save_file_ff __ARGS((buf_T *buf));
|
||||||
|
int file_ff_differs __ARGS((buf_T *buf, int ignore_empty));
|
||||||
|
*** ../vim-7.3.744/src/term.c 2012-10-21 02:10:20.000000000 +0200
|
||||||
|
--- src/term.c 2012-12-03 20:09:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1864,1870 ****
|
||||||
|
--- 1864,1875 ----
|
||||||
|
}
|
||||||
|
# endif
|
||||||
|
if (p != NULL)
|
||||||
|
+ {
|
||||||
|
set_option_value((char_u *)"ttym", 0L, p, 0);
|
||||||
|
+ /* Reset the WAS_SET flag, 'ttymouse' can be set to "sgr" or
|
||||||
|
+ * "xterm2" in check_termcode(). */
|
||||||
|
+ reset_option_was_set((char_u *)"ttym");
|
||||||
|
+ }
|
||||||
|
if (p == NULL
|
||||||
|
# ifdef FEAT_GUI
|
||||||
|
|| gui.in_use
|
||||||
|
*** ../vim-7.3.744/src/version.c 2012-11-29 20:09:55.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 14:39:33.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 745,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
97. Your mother tells you to remember something, and you look for
|
||||||
|
a File/Save command.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
96
7.3.746
Normal file
96
7.3.746
Normal file
@ -0,0 +1,96 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.746
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.746
|
||||||
|
Problem: Memory leaks when using location lists.
|
||||||
|
Solution: Set qf_title to something. (Christian Brabandt)
|
||||||
|
Files: src/eval.c, src/quickfix.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.745/src/eval.c 2012-10-21 23:55:59.000000000 +0200
|
||||||
|
--- src/eval.c 2012-12-05 14:47:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 16292,16298 ****
|
||||||
|
action = *act;
|
||||||
|
}
|
||||||
|
|
||||||
|
! if (l != NULL && set_errorlist(wp, l, action, NULL) == OK)
|
||||||
|
rettv->vval.v_number = 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
--- 16292,16299 ----
|
||||||
|
action = *act;
|
||||||
|
}
|
||||||
|
|
||||||
|
! if (l != NULL && set_errorlist(wp, l, action,
|
||||||
|
! (char_u *)(wp == NULL ? "setqflist()" : "setloclist()")) == OK)
|
||||||
|
rettv->vval.v_number = 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
*** ../vim-7.3.745/src/quickfix.c 2012-11-28 22:12:40.000000000 +0100
|
||||||
|
--- src/quickfix.c 2012-12-05 14:51:52.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2124,2138 ****
|
||||||
|
int idx;
|
||||||
|
{
|
||||||
|
qfline_T *qfp;
|
||||||
|
|
||||||
|
while (qi->qf_lists[idx].qf_count)
|
||||||
|
{
|
||||||
|
qfp = qi->qf_lists[idx].qf_start->qf_next;
|
||||||
|
! if (qi->qf_lists[idx].qf_title != NULL)
|
||||||
|
{
|
||||||
|
vim_free(qi->qf_lists[idx].qf_start->qf_text);
|
||||||
|
vim_free(qi->qf_lists[idx].qf_start->qf_pattern);
|
||||||
|
vim_free(qi->qf_lists[idx].qf_start);
|
||||||
|
}
|
||||||
|
qi->qf_lists[idx].qf_start = qfp;
|
||||||
|
--qi->qf_lists[idx].qf_count;
|
||||||
|
--- 2124,2145 ----
|
||||||
|
int idx;
|
||||||
|
{
|
||||||
|
qfline_T *qfp;
|
||||||
|
+ int stop = FALSE;
|
||||||
|
|
||||||
|
while (qi->qf_lists[idx].qf_count)
|
||||||
|
{
|
||||||
|
qfp = qi->qf_lists[idx].qf_start->qf_next;
|
||||||
|
! if (qi->qf_lists[idx].qf_title != NULL && !stop)
|
||||||
|
{
|
||||||
|
vim_free(qi->qf_lists[idx].qf_start->qf_text);
|
||||||
|
+ stop = (qi->qf_lists[idx].qf_start == qfp);
|
||||||
|
vim_free(qi->qf_lists[idx].qf_start->qf_pattern);
|
||||||
|
vim_free(qi->qf_lists[idx].qf_start);
|
||||||
|
+ if (stop)
|
||||||
|
+ /* Somehow qf_count may have an incorrect value, set it to 1
|
||||||
|
+ * to avoid crashing when it's wrong.
|
||||||
|
+ * TODO: Avoid qf_count being incorrect. */
|
||||||
|
+ qi->qf_lists[idx].qf_count = 1;
|
||||||
|
}
|
||||||
|
qi->qf_lists[idx].qf_start = qfp;
|
||||||
|
--qi->qf_lists[idx].qf_count;
|
||||||
|
*** ../vim-7.3.745/src/version.c 2012-12-05 14:42:56.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 15:15:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 746,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
98. The Alta Vista administrators ask you what sites are missing
|
||||||
|
in their index files.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
67
7.3.747
Normal file
67
7.3.747
Normal file
@ -0,0 +1,67 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.747
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.747
|
||||||
|
Problem: When characters are concealed text aligned with tabs are no longer
|
||||||
|
aligned, e.g. at ":help :index".
|
||||||
|
Solution: Compensate space for tabs for concealed characters. (Dominique
|
||||||
|
Pelle)
|
||||||
|
Files: src/screen.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.746/src/screen.c 2012-10-03 18:24:55.000000000 +0200
|
||||||
|
--- src/screen.c 2012-12-05 15:22:03.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4269,4275 ****
|
||||||
|
{
|
||||||
|
/* tab amount depends on current column */
|
||||||
|
n_extra = (int)wp->w_buffer->b_p_ts
|
||||||
|
! - VCOL_HLC % (int)wp->w_buffer->b_p_ts - 1;
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
mb_utf8 = FALSE; /* don't draw as UTF-8 */
|
||||||
|
#endif
|
||||||
|
--- 4269,4288 ----
|
||||||
|
{
|
||||||
|
/* tab amount depends on current column */
|
||||||
|
n_extra = (int)wp->w_buffer->b_p_ts
|
||||||
|
! - vcol % (int)wp->w_buffer->b_p_ts - 1;
|
||||||
|
! #ifdef FEAT_CONCEAL
|
||||||
|
! /* Tab alignment should be identical regardless of
|
||||||
|
! * 'conceallevel' value. So tab compensates of all
|
||||||
|
! * previous concealed characters, and thus resets vcol_off
|
||||||
|
! * and boguscols accumulated so far in the line. Note that
|
||||||
|
! * the tab can be longer than 'tabstop' when there
|
||||||
|
! * are concealed characters. */
|
||||||
|
! n_extra += vcol_off;
|
||||||
|
! vcol -= vcol_off;
|
||||||
|
! vcol_off = 0;
|
||||||
|
! col -= boguscols;
|
||||||
|
! boguscols = 0;
|
||||||
|
! #endif
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
mb_utf8 = FALSE; /* don't draw as UTF-8 */
|
||||||
|
#endif
|
||||||
|
*** ../vim-7.3.746/src/version.c 2012-12-05 15:16:42.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 15:22:27.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 747,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
99. The hum of a cooling fan and the click of keys is comforting to you.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
473
7.3.748
Normal file
473
7.3.748
Normal file
@ -0,0 +1,473 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.748
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.748
|
||||||
|
Problem: Cannot properly test conceal mode.
|
||||||
|
Solution: Add the screencol() and screenrow() functions. Use them in
|
||||||
|
test88. (Simon Ruderich)
|
||||||
|
Files: runtime/doc/eval.txt, src/eval.c, src/proto/screen.pro,
|
||||||
|
src/screen.c, src/testdir/Make_amiga.mak,
|
||||||
|
src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
|
||||||
|
src/testdir/Make_os2.mak, src/testdir/Make_vms.mms
|
||||||
|
src/testdir/Makefile, src/testdir/test88.in,
|
||||||
|
src/testdir/test88.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.747/runtime/doc/eval.txt 2012-11-14 18:10:49.000000000 +0100
|
||||||
|
--- runtime/doc/eval.txt 2012-12-05 15:45:34.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1892,1897 ****
|
||||||
|
--- 1903,1910 ----
|
||||||
|
resolve( {filename}) String get filename a shortcut points to
|
||||||
|
reverse( {list}) List reverse {list} in-place
|
||||||
|
round( {expr}) Float round off {expr}
|
||||||
|
+ screencol() Number current cursor column
|
||||||
|
+ screenrow() Number current cursor row
|
||||||
|
search( {pattern} [, {flags} [, {stopline} [, {timeout}]]])
|
||||||
|
Number search for {pattern}
|
||||||
|
searchdecl( {name} [, {global} [, {thisblock}]])
|
||||||
|
***************
|
||||||
|
*** 4848,4862 ****
|
||||||
|
echo round(-4.5)
|
||||||
|
< -5.0
|
||||||
|
{only available when compiled with the |+float| feature}
|
||||||
|
!
|
||||||
|
!
|
||||||
|
search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()*
|
||||||
|
Search for regexp pattern {pattern}. The search starts at the
|
||||||
|
cursor position (you can use |cursor()| to set it).
|
||||||
|
|
||||||
|
If there is no match a 0 is returned and the cursor doesn't
|
||||||
|
move. No error message is given.
|
||||||
|
- When a match has been found its line number is returned.
|
||||||
|
|
||||||
|
{flags} is a String, which can contain these character flags:
|
||||||
|
'b' search backward instead of forward
|
||||||
|
--- 4874,4907 ----
|
||||||
|
echo round(-4.5)
|
||||||
|
< -5.0
|
||||||
|
{only available when compiled with the |+float| feature}
|
||||||
|
!
|
||||||
|
! screencol() *screencol()*
|
||||||
|
! The result is a Number, which is the current screen column of
|
||||||
|
! the cursor. The leftmost column has number 1.
|
||||||
|
! This function is mainly used for testing.
|
||||||
|
!
|
||||||
|
! Note: Always returns the current screen column, thus if used
|
||||||
|
! in a command (e.g. ":echo screencol()") it will return the
|
||||||
|
! column inside the command line, which is 1 when the command is
|
||||||
|
! executed. To get the cursor position in the file use one of
|
||||||
|
! the following mappings: >
|
||||||
|
! nnoremap <expr> GG ":echom ".screencol()."\n"
|
||||||
|
! nnoremap <silent> GG :echom screencol()<CR>
|
||||||
|
! <
|
||||||
|
! screenrow() *screenrow()*
|
||||||
|
! The result is a Number, which is the current screen row of the
|
||||||
|
! cursor. The top line has number one.
|
||||||
|
! This function is mainly used for testing.
|
||||||
|
!
|
||||||
|
! Note: Same restrictions as with |screencol()|.
|
||||||
|
!
|
||||||
|
search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()*
|
||||||
|
Search for regexp pattern {pattern}. The search starts at the
|
||||||
|
cursor position (you can use |cursor()| to set it).
|
||||||
|
|
||||||
|
+ When a match has been found its line number is returned.
|
||||||
|
If there is no match a 0 is returned and the cursor doesn't
|
||||||
|
move. No error message is given.
|
||||||
|
|
||||||
|
{flags} is a String, which can contain these character flags:
|
||||||
|
'b' search backward instead of forward
|
||||||
|
*** ../vim-7.3.747/src/eval.c 2012-12-05 15:16:42.000000000 +0100
|
||||||
|
--- src/eval.c 2012-12-05 16:03:23.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 668,673 ****
|
||||||
|
--- 668,675 ----
|
||||||
|
#ifdef FEAT_FLOAT
|
||||||
|
static void f_round __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
#endif
|
||||||
|
+ static void f_screencol __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
+ static void f_screenrow __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
static void f_search __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
static void f_searchdecl __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
static void f_searchpair __ARGS((typval_T *argvars, typval_T *rettv));
|
||||||
|
***************
|
||||||
|
*** 8033,8038 ****
|
||||||
|
--- 8035,8042 ----
|
||||||
|
#ifdef FEAT_FLOAT
|
||||||
|
{"round", 1, 1, f_round},
|
||||||
|
#endif
|
||||||
|
+ {"screencol", 0, 0, f_screencol},
|
||||||
|
+ {"screenrow", 0, 0, f_screenrow},
|
||||||
|
{"search", 1, 4, f_search},
|
||||||
|
{"searchdecl", 1, 3, f_searchdecl},
|
||||||
|
{"searchpair", 3, 7, f_searchpair},
|
||||||
|
***************
|
||||||
|
*** 15725,15730 ****
|
||||||
|
--- 15729,15758 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * "screencol()" function
|
||||||
|
+ *
|
||||||
|
+ * First column is 1 to be consistent with virtcol().
|
||||||
|
+ */
|
||||||
|
+ static void
|
||||||
|
+ f_screencol(argvars, rettv)
|
||||||
|
+ typval_T *argvars UNUSED;
|
||||||
|
+ typval_T *rettv;
|
||||||
|
+ {
|
||||||
|
+ rettv->vval.v_number = screen_screencol() + 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * "screenrow()" function
|
||||||
|
+ */
|
||||||
|
+ static void
|
||||||
|
+ f_screenrow(argvars, rettv)
|
||||||
|
+ typval_T *argvars UNUSED;
|
||||||
|
+ typval_T *rettv;
|
||||||
|
+ {
|
||||||
|
+ rettv->vval.v_number = screen_screenrow() + 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
* "search()" function
|
||||||
|
*/
|
||||||
|
static void
|
||||||
|
*** ../vim-7.3.747/src/proto/screen.pro 2012-11-20 16:56:49.000000000 +0100
|
||||||
|
--- src/proto/screen.pro 2012-12-05 15:57:35.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 50,53 ****
|
||||||
|
--- 50,55 ----
|
||||||
|
int messaging __ARGS((void));
|
||||||
|
void showruler __ARGS((int always));
|
||||||
|
int number_width __ARGS((win_T *wp));
|
||||||
|
+ int screen_screencol __ARGS((void));
|
||||||
|
+ int screen_screenrow __ARGS((void));
|
||||||
|
/* vim: set ft=c : */
|
||||||
|
*** ../vim-7.3.747/src/screen.c 2012-12-05 15:32:24.000000000 +0100
|
||||||
|
--- src/screen.c 2012-12-05 15:58:02.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 10264,10266 ****
|
||||||
|
--- 10264,10286 ----
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Return the current cursor column. This is the actual position on the
|
||||||
|
+ * screen. First column is 0.
|
||||||
|
+ */
|
||||||
|
+ int
|
||||||
|
+ screen_screencol()
|
||||||
|
+ {
|
||||||
|
+ return screen_cur_col;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Return the current cursor row. This is the actual position on the screen.
|
||||||
|
+ * First row is 0.
|
||||||
|
+ */
|
||||||
|
+ int
|
||||||
|
+ screen_screenrow()
|
||||||
|
+ {
|
||||||
|
+ return screen_cur_row;
|
||||||
|
+ }
|
||||||
|
*** ../vim-7.3.747/src/testdir/Make_amiga.mak 2012-06-29 12:54:32.000000000 +0200
|
||||||
|
--- src/testdir/Make_amiga.mak 2012-12-05 16:00:14.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 31,37 ****
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
--- 31,37 ----
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out test88.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 135,137 ****
|
||||||
|
--- 135,138 ----
|
||||||
|
test82.out: test82.in
|
||||||
|
test83.out: test83.in
|
||||||
|
test84.out: test84.in
|
||||||
|
+ test88.out: test88.in
|
||||||
|
*** ../vim-7.3.747/src/testdir/Make_dos.mak 2012-10-06 19:10:29.000000000 +0200
|
||||||
|
--- src/testdir/Make_dos.mak 2012-12-05 16:00:29.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 30,36 ****
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
--- 30,36 ----
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
*** ../vim-7.3.747/src/testdir/Make_ming.mak 2012-10-06 19:10:29.000000000 +0200
|
||||||
|
--- src/testdir/Make_ming.mak 2012-12-05 16:00:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 50,56 ****
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
--- 50,56 ----
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
*** ../vim-7.3.747/src/testdir/Make_os2.mak 2012-06-29 12:54:32.000000000 +0200
|
||||||
|
--- src/testdir/Make_os2.mak 2012-12-05 16:00:50.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 31,37 ****
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
--- 31,37 ----
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out test88.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
*** ../vim-7.3.747/src/testdir/Make_vms.mms 2012-10-06 19:10:29.000000000 +0200
|
||||||
|
--- src/testdir/Make_vms.mms 2012-12-05 16:01:03.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4,10 ****
|
||||||
|
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
||||||
|
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
||||||
|
#
|
||||||
|
! # Last change: 2012 Oct 06
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
--- 4,10 ----
|
||||||
|
# Authors: Zoltan Arpadffy, <arpadffy@polarhome.com>
|
||||||
|
# Sandor Kopanyi, <sandor.kopanyi@mailbox.hu>
|
||||||
|
#
|
||||||
|
! # Last change: 2012 Dec 05
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
***************
|
||||||
|
*** 76,82 ****
|
||||||
|
test66.out test67.out test68.out test69.out \
|
||||||
|
test71.out test72.out test74.out test75.out test76.out \
|
||||||
|
test77.out test78.out test79.out test80.out test81.out \
|
||||||
|
! test82.out test83.out test84.out
|
||||||
|
|
||||||
|
# Known problems:
|
||||||
|
# Test 30: a problem around mac format - unknown reason
|
||||||
|
--- 76,82 ----
|
||||||
|
test66.out test67.out test68.out test69.out \
|
||||||
|
test71.out test72.out test74.out test75.out test76.out \
|
||||||
|
test77.out test78.out test79.out test80.out test81.out \
|
||||||
|
! test82.out test83.out test84.out test88.out
|
||||||
|
|
||||||
|
# Known problems:
|
||||||
|
# Test 30: a problem around mac format - unknown reason
|
||||||
|
*** ../vim-7.3.747/src/testdir/Makefile 2012-10-06 19:10:29.000000000 +0200
|
||||||
|
--- src/testdir/Makefile 2012-12-05 15:59:02.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 13,19 ****
|
||||||
|
|
||||||
|
SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
|
||||||
|
test7.out test8.out test9.out test10.out test11.out \
|
||||||
|
! test12.out test13.out test14.out test15.out test17.out \
|
||||||
|
test18.out test19.out test20.out test21.out test22.out \
|
||||||
|
test23.out test24.out test25.out test26.out test27.out \
|
||||||
|
test28.out test29.out test30.out test31.out test32.out \
|
||||||
|
--- 13,19 ----
|
||||||
|
|
||||||
|
SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
|
||||||
|
test7.out test8.out test9.out test10.out test11.out \
|
||||||
|
! test12.out test13.out test14.out test15.out test17.out \
|
||||||
|
test18.out test19.out test20.out test21.out test22.out \
|
||||||
|
test23.out test24.out test25.out test26.out test27.out \
|
||||||
|
test28.out test29.out test30.out test31.out test32.out \
|
||||||
|
***************
|
||||||
|
*** 27,33 ****
|
||||||
|
test69.out test70.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out
|
||||||
|
|
||||||
|
SCRIPTS_GUI = test16.out
|
||||||
|
|
||||||
|
--- 27,33 ----
|
||||||
|
test69.out test70.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out
|
||||||
|
|
||||||
|
SCRIPTS_GUI = test16.out
|
||||||
|
|
||||||
|
*** ../vim-7.3.747/src/testdir/test88.in 2012-12-05 16:08:56.000000000 +0100
|
||||||
|
--- src/testdir/test88.in 2012-12-05 15:40:05.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 0 ****
|
||||||
|
--- 1,85 ----
|
||||||
|
+ vim: set ft=vim
|
||||||
|
+
|
||||||
|
+ Tests for correct display (cursor column position) with +conceal and
|
||||||
|
+ tabulators.
|
||||||
|
+
|
||||||
|
+ STARTTEST
|
||||||
|
+ :so small.vim
|
||||||
|
+ :if !has('conceal')
|
||||||
|
+ e! test.ok
|
||||||
|
+ wq! test.out
|
||||||
|
+ :endif
|
||||||
|
+ :" Conceal settings.
|
||||||
|
+ :set conceallevel=2
|
||||||
|
+ :set concealcursor=nc
|
||||||
|
+ :syntax match test /|/ conceal
|
||||||
|
+ :" Save current cursor position. Only works in <expr> mode, can't be used
|
||||||
|
+ :" with :normal because it moves the cursor to the command line. Thanks to ZyX
|
||||||
|
+ :" <zyx.vim@gmail.com> for the idea to use an <expr> mapping.
|
||||||
|
+ :let positions = []
|
||||||
|
+ :nnoremap <expr> GG ":let positions += ['".screenrow().":".screencol()."']\n"
|
||||||
|
+ :" Start test.
|
||||||
|
+ /^start:
|
||||||
|
+ :normal ztj
|
||||||
|
+ GGk
|
||||||
|
+ :" We should end up in the same column when running these commands on the two
|
||||||
|
+ :" lines.
|
||||||
|
+ :normal ft
|
||||||
|
+ GGk
|
||||||
|
+ :normal $
|
||||||
|
+ GGk
|
||||||
|
+ :normal 0j
|
||||||
|
+ GGk
|
||||||
|
+ :normal ft
|
||||||
|
+ GGk
|
||||||
|
+ :normal $
|
||||||
|
+ GGk
|
||||||
|
+ :normal 0j0j
|
||||||
|
+ GGk
|
||||||
|
+ :" Same for next test block.
|
||||||
|
+ :normal ft
|
||||||
|
+ GGk
|
||||||
|
+ :normal $
|
||||||
|
+ GGk
|
||||||
|
+ :normal 0j
|
||||||
|
+ GGk
|
||||||
|
+ :normal ft
|
||||||
|
+ GGk
|
||||||
|
+ :normal $
|
||||||
|
+ GGk
|
||||||
|
+ :normal 0j0j
|
||||||
|
+ GGk
|
||||||
|
+ :" And check W with multiple tabs and conceals in a line.
|
||||||
|
+ :normal W
|
||||||
|
+ GGk
|
||||||
|
+ :normal W
|
||||||
|
+ GGk
|
||||||
|
+ :normal W
|
||||||
|
+ GGk
|
||||||
|
+ :normal $
|
||||||
|
+ GGk
|
||||||
|
+ :normal 0j
|
||||||
|
+ GGk
|
||||||
|
+ :normal W
|
||||||
|
+ GGk
|
||||||
|
+ :normal W
|
||||||
|
+ GGk
|
||||||
|
+ :normal W
|
||||||
|
+ GGk
|
||||||
|
+ :normal $
|
||||||
|
+ GGk
|
||||||
|
+ :" Display result.
|
||||||
|
+ :call append('$', 'end:')
|
||||||
|
+ :call append('$', positions)
|
||||||
|
+ :/^end/,$wq! test.out
|
||||||
|
+ ENDTEST
|
||||||
|
+
|
||||||
|
+ start:
|
||||||
|
+ .concealed. text
|
||||||
|
+ |concealed| text
|
||||||
|
+
|
||||||
|
+ .concealed. text
|
||||||
|
+ |concealed| text
|
||||||
|
+
|
||||||
|
+ .a. .b. .c. .d.
|
||||||
|
+ |a| |b| |c| |d|
|
||||||
|
*** ../vim-7.3.747/src/testdir/test88.ok 2012-12-05 16:08:56.000000000 +0100
|
||||||
|
--- src/testdir/test88.ok 2012-12-05 15:40:05.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 0 ****
|
||||||
|
--- 1,23 ----
|
||||||
|
+ end:
|
||||||
|
+ 2:1
|
||||||
|
+ 2:17
|
||||||
|
+ 2:20
|
||||||
|
+ 3:1
|
||||||
|
+ 3:17
|
||||||
|
+ 3:20
|
||||||
|
+ 5:8
|
||||||
|
+ 5:25
|
||||||
|
+ 5:28
|
||||||
|
+ 6:8
|
||||||
|
+ 6:25
|
||||||
|
+ 6:28
|
||||||
|
+ 8:1
|
||||||
|
+ 8:9
|
||||||
|
+ 8:17
|
||||||
|
+ 8:25
|
||||||
|
+ 8:27
|
||||||
|
+ 9:1
|
||||||
|
+ 9:9
|
||||||
|
+ 9:17
|
||||||
|
+ 9:25
|
||||||
|
+ 9:26
|
||||||
|
*** ../vim-7.3.747/src/version.c 2012-12-05 15:32:24.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 16:07:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 748,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
101. U can read htis w/o ny porblm and cant figur eout Y its evn listd.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
59
7.3.749
Normal file
59
7.3.749
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.749
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.749
|
||||||
|
Problem: Python interface doesn't build without the multi-byte feature.
|
||||||
|
Solution: Add #ifdef. (Ken Takata)
|
||||||
|
Files: src/if_py_both.h
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.748/src/if_py_both.h 2012-10-05 21:30:04.000000000 +0200
|
||||||
|
--- src/if_py_both.h 2012-12-05 16:27:20.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 520,526 ****
|
||||||
|
if (!PyArg_ParseTuple(args, "s", &expr))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
! return PyLong_FromLong(mb_string2cells((char_u *)expr, (int)STRLEN(expr)));
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- 520,532 ----
|
||||||
|
if (!PyArg_ParseTuple(args, "s", &expr))
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
! return PyLong_FromLong(
|
||||||
|
! #ifdef FEAT_MBYTE
|
||||||
|
! mb_string2cells((char_u *)expr, (int)STRLEN(expr))
|
||||||
|
! #else
|
||||||
|
! STRLEN(expr)
|
||||||
|
! #endif
|
||||||
|
! );
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*** ../vim-7.3.748/src/version.c 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 16:29:27.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 749,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Contrary to popular belief, Unix is user friendly.
|
||||||
|
It just happens to be selective about who it makes friends with.
|
||||||
|
-- Dave Parnas
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
83
7.3.750
Normal file
83
7.3.750
Normal file
@ -0,0 +1,83 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.750
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.750
|
||||||
|
Problem: The justify macro does not always work correctly.
|
||||||
|
Solution: Fix off-by-one error (James McCoy)
|
||||||
|
Files: runtime/macros/justify.vim
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.749/runtime/macros/justify.vim 2010-08-15 21:57:19.000000000 +0200
|
||||||
|
--- runtime/macros/justify.vim 2012-12-05 16:58:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1,4 ****
|
||||||
|
! " Function to left and rigt align text.
|
||||||
|
"
|
||||||
|
" Written by: Preben "Peppe" Guldberg <c928400@student.dtu.dk>
|
||||||
|
" Created: 980806 14:13 (or around that time anyway)
|
||||||
|
--- 1,4 ----
|
||||||
|
! " Function to left and right align text.
|
||||||
|
"
|
||||||
|
" Written by: Preben "Peppe" Guldberg <c928400@student.dtu.dk>
|
||||||
|
" Created: 980806 14:13 (or around that time anyway)
|
||||||
|
***************
|
||||||
|
*** 256,273 ****
|
||||||
|
let str = substitute(str, '\s\+$', '', '')
|
||||||
|
let str = substitute(str, '^\s\+', '', '')
|
||||||
|
let str = substitute(str, '\s\+', ' ', 'g')
|
||||||
|
! " Use substitute() hack to get strlen in characters instead of bytes
|
||||||
|
! let str_n = strlen(substitute(str, '.', 'x', 'g'))
|
||||||
|
|
||||||
|
" Possible addition of space after punctuation
|
||||||
|
if exists("join_str")
|
||||||
|
let str = substitute(str, join_str, '\1 ', 'g')
|
||||||
|
endif
|
||||||
|
! let join_n = strlen(substitute(str, '.', 'x', 'g')) - str_n
|
||||||
|
|
||||||
|
" Can extraspaces be added?
|
||||||
|
" Note that str_n may be less than strlen(str) [joinspaces above]
|
||||||
|
! if strlen(substitute(str, '.', 'x', 'g')) < tw - indent_n && str_n > 0
|
||||||
|
" How many spaces should be added
|
||||||
|
let s_add = tw - str_n - indent_n - join_n
|
||||||
|
let s_nr = strlen(substitute(str, '\S', '', 'g') ) - join_n
|
||||||
|
--- 256,272 ----
|
||||||
|
let str = substitute(str, '\s\+$', '', '')
|
||||||
|
let str = substitute(str, '^\s\+', '', '')
|
||||||
|
let str = substitute(str, '\s\+', ' ', 'g')
|
||||||
|
! let str_n = strdisplaywidth(str)
|
||||||
|
|
||||||
|
" Possible addition of space after punctuation
|
||||||
|
if exists("join_str")
|
||||||
|
let str = substitute(str, join_str, '\1 ', 'g')
|
||||||
|
endif
|
||||||
|
! let join_n = strdisplaywidth(str) - str_n
|
||||||
|
|
||||||
|
" Can extraspaces be added?
|
||||||
|
" Note that str_n may be less than strlen(str) [joinspaces above]
|
||||||
|
! if strdisplaywidth(str) <= tw - indent_n && str_n > 0
|
||||||
|
" How many spaces should be added
|
||||||
|
let s_add = tw - str_n - indent_n - join_n
|
||||||
|
let s_nr = strlen(substitute(str, '\S', '', 'g') ) - join_n
|
||||||
|
*** ../vim-7.3.749/src/version.c 2012-12-05 16:30:03.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 17:01:02.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 750,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
To be rich is not the end, but only a change of worries.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
103
7.3.751
Normal file
103
7.3.751
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.751
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.751
|
||||||
|
Problem: Test 61 is flaky, it fails once in a while.
|
||||||
|
Solution: When it fails retry once.
|
||||||
|
Files: src/testdir/Makefile
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.750/src/testdir/Makefile 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/testdir/Makefile 2012-12-05 18:17:03.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 47,58 ****
|
||||||
|
|
||||||
|
$(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
! -rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* valgrind.* viminfo
|
||||||
|
|
||||||
|
test1.out: test1.in
|
||||||
|
! -rm -f $*.failed tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok X* viminfo
|
||||||
|
! $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
|
||||||
|
@/bin/sh -c "if diff test.out $*.ok; \
|
||||||
|
then mv -f test.out $*.out; \
|
||||||
|
else echo; \
|
||||||
|
--- 47,62 ----
|
||||||
|
|
||||||
|
$(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
|
||||||
|
|
||||||
|
+ RM_ON_RUN = test.out X* viminfo
|
||||||
|
+ RM_ON_START = tiny.vim small.vim mbyte.vim mzscheme.vim lua.vim test.ok
|
||||||
|
+ RUN_VIM = $(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in
|
||||||
|
+
|
||||||
|
clean:
|
||||||
|
! -rm -rf *.out *.failed *.rej *.orig test.log $(RM_ON_RUN) $(RM_ON_START) valgrind.*
|
||||||
|
|
||||||
|
test1.out: test1.in
|
||||||
|
! -rm -rf $*.failed $(RM_ON_RUN) $(RM_ON_START)
|
||||||
|
! $(RUN_VIM) $*.in
|
||||||
|
@/bin/sh -c "if diff test.out $*.ok; \
|
||||||
|
then mv -f test.out $*.out; \
|
||||||
|
else echo; \
|
||||||
|
***************
|
||||||
|
*** 61,71 ****
|
||||||
|
-rm -rf X* viminfo
|
||||||
|
|
||||||
|
.in.out:
|
||||||
|
! -rm -rf $*.failed test.ok test.out X* viminfo
|
||||||
|
cp $*.ok test.ok
|
||||||
|
# Sleep a moment to avoid that the xterm title is messed up
|
||||||
|
@-sleep .2
|
||||||
|
! -$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
|
||||||
|
@/bin/sh -c "if test -f test.out; then\
|
||||||
|
if diff test.out $*.ok; \
|
||||||
|
then mv -f test.out $*.out; \
|
||||||
|
--- 65,86 ----
|
||||||
|
-rm -rf X* viminfo
|
||||||
|
|
||||||
|
.in.out:
|
||||||
|
! -rm -rf $*.failed test.ok $(RM_ON_RUN)
|
||||||
|
cp $*.ok test.ok
|
||||||
|
# Sleep a moment to avoid that the xterm title is messed up
|
||||||
|
@-sleep .2
|
||||||
|
! -$(RUN_VIM) $*.in
|
||||||
|
!
|
||||||
|
! # For flaky tests retry one time.
|
||||||
|
! @/bin/sh -c "if test -f test.out -a $* = test61; then \
|
||||||
|
! if diff test.out $*.ok; \
|
||||||
|
! then echo flaky test ok first time; \
|
||||||
|
! else rm -rf $*.failed $(RM_ON_RUN); \
|
||||||
|
! $(RUN_VIM) $*.in; \
|
||||||
|
! fi \
|
||||||
|
! fi"
|
||||||
|
!
|
||||||
|
! # Check if the test.out file matches test.ok.
|
||||||
|
@/bin/sh -c "if test -f test.out; then\
|
||||||
|
if diff test.out $*.ok; \
|
||||||
|
then mv -f test.out $*.out; \
|
||||||
|
*** ../vim-7.3.750/src/version.c 2012-12-05 17:03:17.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 18:10:49.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 751,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
103. When you find yourself in the "Computer" section of Barnes & Noble
|
||||||
|
enjoying yourself.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
68
7.3.752
Normal file
68
7.3.752
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.752
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.752
|
||||||
|
Problem: Test 49 script file doesn't fold properly.
|
||||||
|
Solution: Add a colon.
|
||||||
|
Files: src/testdir/test49.vim
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.751/src/testdir/test49.vim 2012-11-14 22:38:04.000000000 +0100
|
||||||
|
--- src/testdir/test49.vim 2012-11-23 22:08:37.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1,6 ****
|
||||||
|
" Vim script language tests
|
||||||
|
" Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
|
||||||
|
! " Last Change: 2010 Sep 29
|
||||||
|
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
" Test environment {{{1
|
||||||
|
--- 1,6 ----
|
||||||
|
" Vim script language tests
|
||||||
|
" Author: Servatius Brandt <Servatius.Brandt@fujitsu-siemens.com>
|
||||||
|
! " Last Change: 2012 Nov 23
|
||||||
|
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
" Test environment {{{1
|
||||||
|
***************
|
||||||
|
*** 9604,9610 ****
|
||||||
|
Xcheck 198689
|
||||||
|
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
! " Test 86 setloclist crash {{{1
|
||||||
|
"
|
||||||
|
" Executing a setloclist() on BufUnload shouldn't crash Vim
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
--- 9604,9610 ----
|
||||||
|
Xcheck 198689
|
||||||
|
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
! " Test 86: setloclist crash {{{1
|
||||||
|
"
|
||||||
|
" Executing a setloclist() on BufUnload shouldn't crash Vim
|
||||||
|
"-------------------------------------------------------------------------------
|
||||||
|
*** ../vim-7.3.751/src/version.c 2012-12-05 18:21:28.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 18:59:50.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 752,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
106. When told to "go to your room" you inform your parents that you
|
||||||
|
can't...because you were kicked out and banned.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
103
7.3.753
Normal file
103
7.3.753
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.753
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.753
|
||||||
|
Problem: When there is a QuitPre autocommand using ":q" twice does not work
|
||||||
|
for exiting when there are more files to edit.
|
||||||
|
Solution: Do not decrement quitmore in an autocommand. (Techlive Zheng)
|
||||||
|
Files: src/ex_docmd.c, src/fileio.c, src/proto/fileio.pro
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.752/src/ex_docmd.c 2012-11-28 23:03:02.000000000 +0100
|
||||||
|
--- src/ex_docmd.c 2012-12-05 19:07:01.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1729,1739 ****
|
||||||
|
++ex_nesting_level;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! /* when not editing the last file :q has to be typed twice */
|
||||||
|
if (quitmore
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
/* avoid that a function call in 'statusline' does this */
|
||||||
|
&& !getline_equal(fgetline, cookie, get_func_line)
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
--quitmore;
|
||||||
|
--- 1729,1741 ----
|
||||||
|
++ex_nesting_level;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! /* When the last file has not been edited :q has to be typed twice. */
|
||||||
|
if (quitmore
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
/* avoid that a function call in 'statusline' does this */
|
||||||
|
&& !getline_equal(fgetline, cookie, get_func_line)
|
||||||
|
+ /* avoid that an autocommand, e.g. QuitPre, does this */
|
||||||
|
+ && !getline_equal(fgetline, cookie, getnextac)
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
--quitmore;
|
||||||
|
*** ../vim-7.3.752/src/fileio.c 2012-08-29 18:50:50.000000000 +0200
|
||||||
|
--- src/fileio.c 2012-12-05 19:08:17.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7774,7780 ****
|
||||||
|
static int event_ignored __ARGS((event_T event));
|
||||||
|
static int au_get_grouparg __ARGS((char_u **argp));
|
||||||
|
static int do_autocmd_event __ARGS((event_T event, char_u *pat, int nested, char_u *cmd, int forceit, int group));
|
||||||
|
- static char_u *getnextac __ARGS((int c, void *cookie, int indent));
|
||||||
|
static int apply_autocmds_group __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, int group, buf_T *buf, exarg_T *eap));
|
||||||
|
static void auto_next_pat __ARGS((AutoPatCmd *apc, int stop_at_last));
|
||||||
|
|
||||||
|
--- 7774,7779 ----
|
||||||
|
***************
|
||||||
|
*** 9613,9619 ****
|
||||||
|
* Called by do_cmdline() to get the next line for ":if".
|
||||||
|
* Returns allocated string, or NULL for end of autocommands.
|
||||||
|
*/
|
||||||
|
! static char_u *
|
||||||
|
getnextac(c, cookie, indent)
|
||||||
|
int c UNUSED;
|
||||||
|
void *cookie;
|
||||||
|
--- 9612,9618 ----
|
||||||
|
* Called by do_cmdline() to get the next line for ":if".
|
||||||
|
* Returns allocated string, or NULL for end of autocommands.
|
||||||
|
*/
|
||||||
|
! char_u *
|
||||||
|
getnextac(c, cookie, indent)
|
||||||
|
int c UNUSED;
|
||||||
|
void *cookie;
|
||||||
|
*** ../vim-7.3.752/src/proto/fileio.pro 2012-02-29 18:22:03.000000000 +0100
|
||||||
|
--- src/proto/fileio.pro 2012-12-05 19:08:24.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 47,52 ****
|
||||||
|
--- 47,53 ----
|
||||||
|
int has_insertcharpre __ARGS((void));
|
||||||
|
void block_autocmds __ARGS((void));
|
||||||
|
void unblock_autocmds __ARGS((void));
|
||||||
|
+ char_u *getnextac __ARGS((int c, void *cookie, int indent));
|
||||||
|
int has_autocmd __ARGS((event_T event, char_u *sfname, buf_T *buf));
|
||||||
|
char_u *get_augroup_name __ARGS((expand_T *xp, int idx));
|
||||||
|
char_u *set_context_in_autocmd __ARGS((expand_T *xp, char_u *arg, int doautocmd));
|
||||||
|
*** ../vim-7.3.752/src/version.c 2012-12-05 19:00:03.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-05 19:08:34.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 753,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Laughing helps. It's like jogging on the inside.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
48
7.3.754
Normal file
48
7.3.754
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.754
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.754
|
||||||
|
Problem: Latest nmake is not recognized.
|
||||||
|
Solution: Add nmake version 11.00.51106.1. (Raymond Ko)
|
||||||
|
Files: src/Make_mvc.mak
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.753/src/Make_mvc.mak 2012-10-23 05:35:30.000000000 +0200
|
||||||
|
--- src/Make_mvc.mak 2012-12-06 21:27:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 413,418 ****
|
||||||
|
--- 413,421 ----
|
||||||
|
!if "$(_NMAKE_VER)" == "11.00.50727.1"
|
||||||
|
MSVCVER = 11.0
|
||||||
|
!endif
|
||||||
|
+ !if "$(_NMAKE_VER)" == "11.00.51106.1"
|
||||||
|
+ MSVCVER = 11.0
|
||||||
|
+ !endif
|
||||||
|
!endif
|
||||||
|
|
||||||
|
# Abort bulding VIM if version of VC is unrecognised.
|
||||||
|
*** ../vim-7.3.753/src/version.c 2012-12-05 19:13:11.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-06 21:29:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 754,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
116. You are living with your boyfriend who networks your respective
|
||||||
|
computers so you can sit in separate rooms and email each other
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
137
7.3.755
Normal file
137
7.3.755
Normal file
@ -0,0 +1,137 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.755
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.755
|
||||||
|
Problem: Autoconf doesn't find Python 3 if it's called "python".
|
||||||
|
Solution: Search for "python2" and "python3" first, then "python".
|
||||||
|
Files: src/configure.in, src/auto/configure
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.754/src/configure.in 2012-11-23 21:54:43.000000000 +0100
|
||||||
|
--- src/configure.in 2012-12-09 15:41:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 838,844 ****
|
||||||
|
AC_MSG_RESULT($enable_pythoninterp)
|
||||||
|
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
|
||||||
|
dnl -- find the python executable
|
||||||
|
! AC_PATH_PROG(vi_cv_path_python, python)
|
||||||
|
if test "X$vi_cv_path_python" != "X"; then
|
||||||
|
|
||||||
|
dnl -- get its version number
|
||||||
|
--- 838,844 ----
|
||||||
|
AC_MSG_RESULT($enable_pythoninterp)
|
||||||
|
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
|
||||||
|
dnl -- find the python executable
|
||||||
|
! AC_PATH_PROGS(vi_cv_path_python, python2 python)
|
||||||
|
if test "X$vi_cv_path_python" != "X"; then
|
||||||
|
|
||||||
|
dnl -- get its version number
|
||||||
|
***************
|
||||||
|
*** 1028,1034 ****
|
||||||
|
AC_MSG_RESULT($enable_python3interp)
|
||||||
|
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
|
||||||
|
dnl -- find the python3 executable
|
||||||
|
! AC_PATH_PROG(vi_cv_path_python3, python3)
|
||||||
|
if test "X$vi_cv_path_python3" != "X"; then
|
||||||
|
|
||||||
|
dnl -- get its version number
|
||||||
|
--- 1028,1034 ----
|
||||||
|
AC_MSG_RESULT($enable_python3interp)
|
||||||
|
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
|
||||||
|
dnl -- find the python3 executable
|
||||||
|
! AC_PATH_PROGS(vi_cv_path_python3, python3 python)
|
||||||
|
if test "X$vi_cv_path_python3" != "X"; then
|
||||||
|
|
||||||
|
dnl -- get its version number
|
||||||
|
*** ../vim-7.3.754/src/auto/configure 2012-11-23 21:54:43.000000000 +0100
|
||||||
|
--- src/auto/configure 2012-12-12 14:23:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 5214,5221 ****
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
|
||||||
|
$as_echo "$enable_pythoninterp" >&6; }
|
||||||
|
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
|
||||||
|
! # Extract the first word of "python", so it can be a program name with args.
|
||||||
|
! set dummy python; ac_word=$2
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
|
if test "${ac_cv_path_vi_cv_path_python+set}" = set; then :
|
||||||
|
--- 5214,5223 ----
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5
|
||||||
|
$as_echo "$enable_pythoninterp" >&6; }
|
||||||
|
if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
|
||||||
|
! for ac_prog in python2 python
|
||||||
|
! do
|
||||||
|
! # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
|
! set dummy $ac_prog; ac_word=$2
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
|
if test "${ac_cv_path_vi_cv_path_python+set}" = set; then :
|
||||||
|
***************
|
||||||
|
*** 5254,5259 ****
|
||||||
|
--- 5256,5264 ----
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
+ test -n "$vi_cv_path_python" && break
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
if test "X$vi_cv_path_python" != "X"; then
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
|
||||||
|
***************
|
||||||
|
*** 5509,5516 ****
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
|
||||||
|
$as_echo "$enable_python3interp" >&6; }
|
||||||
|
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
|
||||||
|
! # Extract the first word of "python3", so it can be a program name with args.
|
||||||
|
! set dummy python3; ac_word=$2
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
|
if test "${ac_cv_path_vi_cv_path_python3+set}" = set; then :
|
||||||
|
--- 5514,5523 ----
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5
|
||||||
|
$as_echo "$enable_python3interp" >&6; }
|
||||||
|
if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
|
||||||
|
! for ac_prog in python3 python
|
||||||
|
! do
|
||||||
|
! # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
|
! set dummy $ac_prog; ac_word=$2
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||||
|
$as_echo_n "checking for $ac_word... " >&6; }
|
||||||
|
if test "${ac_cv_path_vi_cv_path_python3+set}" = set; then :
|
||||||
|
***************
|
||||||
|
*** 5549,5554 ****
|
||||||
|
--- 5556,5564 ----
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
+ test -n "$vi_cv_path_python3" && break
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
if test "X$vi_cv_path_python3" != "X"; then
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Python version" >&5
|
||||||
|
*** ../vim-7.3.754/src/version.c 2012-12-06 21:30:24.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 14:23:14.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 755,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
145. You e-mail your boss, informing him you'll be late.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
107
7.3.756
Normal file
107
7.3.756
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.756
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.756
|
||||||
|
Problem: A location list can get a wrong count in :lvimgrep.
|
||||||
|
Solution: Check if the list was changed by autocommands. (mostly by
|
||||||
|
Christian Brabandt)
|
||||||
|
Files: src/quickfic.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.755/src/quickfix.c 2012-12-05 15:16:42.000000000 +0100
|
||||||
|
--- src/quickfix.c 2012-12-12 15:50:08.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3109,3114 ****
|
||||||
|
--- 3109,3117 ----
|
||||||
|
char_u *p;
|
||||||
|
int fi;
|
||||||
|
qf_info_T *qi = &ql_info;
|
||||||
|
+ #ifdef FEAT_AUTOCMD
|
||||||
|
+ qfline_T *cur_qf_start;
|
||||||
|
+ #endif
|
||||||
|
qfline_T *prevp = NULL;
|
||||||
|
long lnum;
|
||||||
|
buf_T *buf;
|
||||||
|
***************
|
||||||
|
*** 3218,3223 ****
|
||||||
|
--- 3221,3232 ----
|
||||||
|
* ":lcd %:p:h" changes the meaning of short path names. */
|
||||||
|
mch_dirname(dirname_start, MAXPATHL);
|
||||||
|
|
||||||
|
+ #ifdef FEAT_AUTOCMD
|
||||||
|
+ /* Remeber the value of qf_start, so that we can check for autocommands
|
||||||
|
+ * changing the current quickfix list. */
|
||||||
|
+ cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
seconds = (time_t)0;
|
||||||
|
for (fi = 0; fi < fcount && !got_int && tomatch > 0; ++fi)
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 3273,3278 ****
|
||||||
|
--- 3282,3309 ----
|
||||||
|
/* Use existing, loaded buffer. */
|
||||||
|
using_dummy = FALSE;
|
||||||
|
|
||||||
|
+ #ifdef FEAT_AUTOCMD
|
||||||
|
+ if (cur_qf_start != qi->qf_lists[qi->qf_curlist].qf_start)
|
||||||
|
+ {
|
||||||
|
+ int idx;
|
||||||
|
+
|
||||||
|
+ /* Autocommands changed the quickfix list. Find the one we were
|
||||||
|
+ * using and restore it. */
|
||||||
|
+ for (idx = 0; idx < LISTCOUNT; ++idx)
|
||||||
|
+ if (cur_qf_start == qi->qf_lists[idx].qf_start)
|
||||||
|
+ {
|
||||||
|
+ qi->qf_curlist = idx;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
+ if (idx == LISTCOUNT)
|
||||||
|
+ {
|
||||||
|
+ /* List cannot be found, create a new one. */
|
||||||
|
+ qf_new_list(qi, *eap->cmdlinep);
|
||||||
|
+ cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
if (buf == NULL)
|
||||||
|
{
|
||||||
|
if (!got_int)
|
||||||
|
***************
|
||||||
|
*** 3324,3329 ****
|
||||||
|
--- 3355,3363 ----
|
||||||
|
if (got_int)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
+ #ifdef FEAT_AUTOCMD
|
||||||
|
+ cur_qf_start = qi->qf_lists[qi->qf_curlist].qf_start;
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
if (using_dummy)
|
||||||
|
{
|
||||||
|
*** ../vim-7.3.755/src/version.c 2012-12-12 14:25:01.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 15:35:58.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 756,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
146. You experience ACTUAL physical withdrawal symptoms when away
|
||||||
|
from your 'puter and the net.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
51
7.3.757
Normal file
51
7.3.757
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.757
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.757
|
||||||
|
Problem: Issue 96: May access freed memory when a put command triggers
|
||||||
|
autocommands. (Dominique Pelle)
|
||||||
|
Solution: Call u_save() before getting y_array.
|
||||||
|
Files: src/ops.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.756/src/ops.c 2012-09-05 14:18:42.000000000 +0200
|
||||||
|
--- src/ops.c 2012-12-12 16:03:35.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3351,3356 ****
|
||||||
|
--- 3351,3362 ----
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ #ifdef FEAT_AUTOCMD
|
||||||
|
+ /* Autocommands may be executed when saving lines for undo, which may make
|
||||||
|
+ * y_array invalid. Start undo now to avoid that. */
|
||||||
|
+ u_save(curwin->w_cursor.lnum, curwin->w_cursor.lnum + 1);
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
if (insert_string != NULL)
|
||||||
|
{
|
||||||
|
y_type = MCHAR;
|
||||||
|
*** ../vim-7.3.756/src/version.c 2012-12-12 15:55:16.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 16:06:47.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 757,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
We are the Borg of GNU GPL. We will assimilate your source code.
|
||||||
|
Resistance is futile.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
78
7.3.758
Normal file
78
7.3.758
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.758
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.758
|
||||||
|
Problem: Matchit plugin does not handle space in #ifdef.
|
||||||
|
Solution: Change matching pattern to allow spaces. (Mike Morearty)
|
||||||
|
Files: runtime/macros/matchit.vim
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.757/runtime/macros/matchit.vim 2010-08-15 21:57:19.000000000 +0200
|
||||||
|
--- runtime/macros/matchit.vim 2012-12-12 16:34:11.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 131,137 ****
|
||||||
|
" let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
|
||||||
|
" \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
|
||||||
|
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
|
||||||
|
! \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
|
||||||
|
" s:all = pattern with all the keywords
|
||||||
|
let match_words = match_words . (strlen(match_words) ? "," : "") . default
|
||||||
|
if match_words !~ s:notslash . '\\\d'
|
||||||
|
--- 131,137 ----
|
||||||
|
" let default = substitute(escape(&mps, '[$^.*~\\/?]'), '[,:]\+',
|
||||||
|
" \ '\\|', 'g').'\|\/\*\|\*\/\|#if\>\|#ifdef\>\|#else\>\|#elif\>\|#endif\>'
|
||||||
|
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
|
||||||
|
! \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
|
||||||
|
" s:all = pattern with all the keywords
|
||||||
|
let match_words = match_words . (strlen(match_words) ? "," : "") . default
|
||||||
|
if match_words !~ s:notslash . '\\\d'
|
||||||
|
***************
|
||||||
|
*** 649,655 ****
|
||||||
|
" s:all regexp based on s:pat and the default groups
|
||||||
|
" This part is copied and slightly modified from s:Match_wrapper().
|
||||||
|
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
|
||||||
|
! \ '\/\*:\*\/,#if\%(def\)\=:#else\>:#elif\>:#endif\>'
|
||||||
|
" Allow b:match_words = "GetVimMatchWords()" .
|
||||||
|
if b:match_words =~ ":"
|
||||||
|
let match_words = b:match_words
|
||||||
|
--- 649,655 ----
|
||||||
|
" s:all regexp based on s:pat and the default groups
|
||||||
|
" This part is copied and slightly modified from s:Match_wrapper().
|
||||||
|
let default = escape(&mps, '[$^.*~\\/?]') . (strlen(&mps) ? "," : "") .
|
||||||
|
! \ '\/\*:\*\/,#\s*if\%(def\)\=:#\s*else\>:#\s*elif\>:#\s*endif\>'
|
||||||
|
" Allow b:match_words = "GetVimMatchWords()" .
|
||||||
|
if b:match_words =~ ":"
|
||||||
|
let match_words = b:match_words
|
||||||
|
***************
|
||||||
|
*** 808,812 ****
|
||||||
|
--- 808,813 ----
|
||||||
|
endfun
|
||||||
|
|
||||||
|
let &cpo = s:save_cpo
|
||||||
|
+ unlet s:save_cpo
|
||||||
|
|
||||||
|
" vim:sts=2:sw=2:
|
||||||
|
*** ../vim-7.3.757/src/version.c 2012-12-12 16:11:28.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 16:41:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 758,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
147. You finally give up smoking...because it made the monitor dirty.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
106
7.3.759
Normal file
106
7.3.759
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.759
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.759
|
||||||
|
Problem: MS-Windows: Updating the tabline is slow when there are many tabs.
|
||||||
|
Solution: Disable redrawing while performing the update. (Arseny Kapoulkine)
|
||||||
|
Files: src/gui_w48.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.758/src/gui_w48.c 2012-11-20 16:53:34.000000000 +0100
|
||||||
|
--- src/gui_w48.c 2012-12-12 17:10:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2452,2458 ****
|
||||||
|
TCITEM tie;
|
||||||
|
int nr = 0;
|
||||||
|
int curtabidx = 0;
|
||||||
|
- RECT rc;
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
static int use_unicode = FALSE;
|
||||||
|
int uu;
|
||||||
|
--- 2452,2457 ----
|
||||||
|
***************
|
||||||
|
*** 2479,2491 ****
|
||||||
|
tie.mask = TCIF_TEXT;
|
||||||
|
tie.iImage = -1;
|
||||||
|
|
||||||
|
/* Add a label for each tab page. They all contain the same text area. */
|
||||||
|
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr)
|
||||||
|
{
|
||||||
|
if (tp == curtab)
|
||||||
|
curtabidx = nr;
|
||||||
|
|
||||||
|
! if (!TabCtrl_GetItemRect(s_tabhwnd, nr, &rc))
|
||||||
|
{
|
||||||
|
/* Add the tab */
|
||||||
|
tie.pszText = "-Empty-";
|
||||||
|
--- 2478,2493 ----
|
||||||
|
tie.mask = TCIF_TEXT;
|
||||||
|
tie.iImage = -1;
|
||||||
|
|
||||||
|
+ /* Disable redraw for tab updates to eliminate O(N^2) draws. */
|
||||||
|
+ SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)FALSE, 0);
|
||||||
|
+
|
||||||
|
/* Add a label for each tab page. They all contain the same text area. */
|
||||||
|
for (tp = first_tabpage; tp != NULL; tp = tp->tp_next, ++nr)
|
||||||
|
{
|
||||||
|
if (tp == curtab)
|
||||||
|
curtabidx = nr;
|
||||||
|
|
||||||
|
! if (nr >= TabCtrl_GetItemCount(s_tabhwnd))
|
||||||
|
{
|
||||||
|
/* Add the tab */
|
||||||
|
tie.pszText = "-Empty-";
|
||||||
|
***************
|
||||||
|
*** 2519,2529 ****
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Remove any old labels. */
|
||||||
|
! while (TabCtrl_GetItemRect(s_tabhwnd, nr, &rc))
|
||||||
|
TabCtrl_DeleteItem(s_tabhwnd, nr);
|
||||||
|
|
||||||
|
if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
|
||||||
|
TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- 2521,2534 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Remove any old labels. */
|
||||||
|
! while (nr < TabCtrl_GetItemCount(s_tabhwnd))
|
||||||
|
TabCtrl_DeleteItem(s_tabhwnd, nr);
|
||||||
|
|
||||||
|
if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
|
||||||
|
TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
|
||||||
|
+
|
||||||
|
+ /* Re-enable redraw. This should trigger a repaint. */
|
||||||
|
+ SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*** ../vim-7.3.758/src/version.c 2012-12-12 16:43:52.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 17:10:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 759,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
148. You find it easier to dial-up the National Weather Service
|
||||||
|
Weather/your_town/now.html than to simply look out the window.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
99
7.3.760
Normal file
99
7.3.760
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.760
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.760
|
||||||
|
Problem: dv_ deletes the white space before the line.
|
||||||
|
Solution: Move the cursor to the first non-white. (Christian Brabandt)
|
||||||
|
Files: src/normal.c, src/testdir/test19.in, src/testdir/test19.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.759/src/normal.c 2012-10-23 05:08:49.000000000 +0200
|
||||||
|
--- src/normal.c 2012-12-12 17:23:00.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 8628,8634 ****
|
||||||
|
cap->oap->motion_type = MLINE;
|
||||||
|
if (cursor_down(cap->count1 - 1L, cap->oap->op_type == OP_NOP) == FAIL)
|
||||||
|
clearopbeep(cap->oap);
|
||||||
|
! else if ( cap->oap->op_type == OP_DELETE
|
||||||
|
|| cap->oap->op_type == OP_LSHIFT
|
||||||
|
|| cap->oap->op_type == OP_RSHIFT)
|
||||||
|
beginline(BL_SOL | BL_FIX);
|
||||||
|
--- 8628,8636 ----
|
||||||
|
cap->oap->motion_type = MLINE;
|
||||||
|
if (cursor_down(cap->count1 - 1L, cap->oap->op_type == OP_NOP) == FAIL)
|
||||||
|
clearopbeep(cap->oap);
|
||||||
|
! else if ( (cap->oap->op_type == OP_DELETE /* only with linewise motions */
|
||||||
|
! && cap->oap->motion_force != 'v'
|
||||||
|
! && cap->oap->motion_force != Ctrl_V)
|
||||||
|
|| cap->oap->op_type == OP_LSHIFT
|
||||||
|
|| cap->oap->op_type == OP_RSHIFT)
|
||||||
|
beginline(BL_SOL | BL_FIX);
|
||||||
|
*** ../vim-7.3.759/src/testdir/test19.in 2011-09-08 23:22:35.000000000 +0200
|
||||||
|
--- src/testdir/test19.in 2012-12-12 17:19:36.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1,4 ****
|
||||||
|
--- 1,5 ----
|
||||||
|
Tests for "r<Tab>" with 'smarttab' and 'expandtab' set/not set.
|
||||||
|
+ Also test that dv_ works correctly
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
:so small.vim
|
||||||
|
***************
|
||||||
|
*** 16,22 ****
|
||||||
|
:" Test that copyindent works with expandtab set
|
||||||
|
:set expandtab smartindent copyindent ts=8 sw=8 sts=8
|
||||||
|
o{
|
||||||
|
! x:?^start?,$w! test.out
|
||||||
|
:qa!
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
--- 17,25 ----
|
||||||
|
:" Test that copyindent works with expandtab set
|
||||||
|
:set expandtab smartindent copyindent ts=8 sw=8 sts=8
|
||||||
|
o{
|
||||||
|
! x:set nosol
|
||||||
|
! /Second line/
|
||||||
|
! fwdv_:?^start?,$w! test.out
|
||||||
|
:qa!
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 27,29 ****
|
||||||
|
--- 30,33 ----
|
||||||
|
a cde
|
||||||
|
f ghi
|
||||||
|
test text
|
||||||
|
+ Second line beginning with whitespace
|
||||||
|
*** ../vim-7.3.759/src/testdir/test19.ok 2011-09-07 19:58:04.000000000 +0200
|
||||||
|
--- src/testdir/test19.ok 2012-12-12 17:19:36.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7,9 ****
|
||||||
|
--- 7,10 ----
|
||||||
|
test text
|
||||||
|
{
|
||||||
|
x
|
||||||
|
+ with whitespace
|
||||||
|
*** ../vim-7.3.759/src/version.c 2012-12-12 17:12:21.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 17:20:47.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 760,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
hundred-and-one symptoms of being an internet addict:
|
||||||
|
149. You find your computer sexier than your girlfriend
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
93
7.3.761
Normal file
93
7.3.761
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.761
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.761
|
||||||
|
Problem: In Visual mode a "-p does not work. (Marcin Szamotulski)
|
||||||
|
Solution: Avoid writing to "- before putting it. (Christian Brabandt)
|
||||||
|
Files: src/normal.c, src/testdir/test48.in, src/testdir/test48.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.760/src/normal.c 2012-12-12 17:33:26.000000000 +0100
|
||||||
|
--- src/normal.c 2012-12-12 18:11:06.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 9412,9425 ****
|
||||||
|
# ifdef FEAT_CLIPBOARD
|
||||||
|
adjust_clip_reg(®name);
|
||||||
|
# endif
|
||||||
|
! if (regname == 0 || regname == '"' || VIM_ISDIGIT(regname)
|
||||||
|
# ifdef FEAT_CLIPBOARD
|
||||||
|
|| (clip_unnamed && (regname == '*' || regname == '+'))
|
||||||
|
# endif
|
||||||
|
|
||||||
|
)
|
||||||
|
{
|
||||||
|
! /* the delete is going to overwrite the register we want to
|
||||||
|
* put, save it first. */
|
||||||
|
reg1 = get_register(regname, TRUE);
|
||||||
|
}
|
||||||
|
--- 9412,9426 ----
|
||||||
|
# ifdef FEAT_CLIPBOARD
|
||||||
|
adjust_clip_reg(®name);
|
||||||
|
# endif
|
||||||
|
! if (regname == 0 || regname == '"'
|
||||||
|
! || VIM_ISDIGIT(regname) || regname == '-'
|
||||||
|
# ifdef FEAT_CLIPBOARD
|
||||||
|
|| (clip_unnamed && (regname == '*' || regname == '+'))
|
||||||
|
# endif
|
||||||
|
|
||||||
|
)
|
||||||
|
{
|
||||||
|
! /* The delete is going to overwrite the register we want to
|
||||||
|
* put, save it first. */
|
||||||
|
reg1 = get_register(regname, TRUE);
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.760/src/testdir/test48.in 2010-08-15 21:57:29.000000000 +0200
|
||||||
|
--- src/testdir/test48.in 2012-12-12 18:09:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 54,61 ****
|
||||||
|
--- 54,65 ----
|
||||||
|
^O3li4li4li <-- should show the name of a noted text editor
|
||||||
|
^o4li4li4li <-- and its version number-dd
|
||||||
|
:"
|
||||||
|
+ :" Test for yanking and pasting using the small delete register
|
||||||
|
+ gg/^foo
|
||||||
|
+ dewve"-p
|
||||||
|
:wq! test.out
|
||||||
|
ENDTEST
|
||||||
|
+ foo, bar
|
||||||
|
keyword keyw
|
||||||
|
all your base are belong to us
|
||||||
|
1 2 3 4 5 6
|
||||||
|
*** ../vim-7.3.760/src/testdir/test48.ok 2010-08-15 21:57:29.000000000 +0200
|
||||||
|
--- src/testdir/test48.ok 2012-12-12 18:09:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1,3 ****
|
||||||
|
--- 1,4 ----
|
||||||
|
+ , foo
|
||||||
|
keyword keyword
|
||||||
|
all your base
|
||||||
|
are belong to vim
|
||||||
|
*** ../vim-7.3.760/src/version.c 2012-12-12 17:33:26.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-12 18:19:51.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 761,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
You are not really successful until someone claims he sat
|
||||||
|
beside you in school.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
56
7.3.762
Normal file
56
7.3.762
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.762
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.762 (after 7.3.759)
|
||||||
|
Problem: On some systems the tabline is not redrawn.
|
||||||
|
Solution: Call RedrawWindow(). (Charles Peacech)
|
||||||
|
Files: src/gui_w48.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.761/src/gui_w48.c 2012-12-12 17:12:21.000000000 +0100
|
||||||
|
--- src/gui_w48.c 2012-12-16 12:45:47.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2527,2534 ****
|
||||||
|
if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
|
||||||
|
TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
|
||||||
|
|
||||||
|
! /* Re-enable redraw. This should trigger a repaint. */
|
||||||
|
SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- 2527,2536 ----
|
||||||
|
if (TabCtrl_GetCurSel(s_tabhwnd) != curtabidx)
|
||||||
|
TabCtrl_SetCurSel(s_tabhwnd, curtabidx);
|
||||||
|
|
||||||
|
! /* Re-enable redraw and redraw. */
|
||||||
|
SendMessage(s_tabhwnd, WM_SETREDRAW, (WPARAM)TRUE, 0);
|
||||||
|
+ RedrawWindow(s_tabhwnd, NULL, NULL,
|
||||||
|
+ RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
*** ../vim-7.3.761/src/version.c 2012-12-12 18:20:28.000000000 +0100
|
||||||
|
--- src/version.c 2012-12-16 12:46:44.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 762,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
"The question of whether computers can think is just like the question
|
||||||
|
of whether submarines can swim." -- Edsger W. Dijkstra
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
69
7.3.763
Normal file
69
7.3.763
Normal file
@ -0,0 +1,69 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.763
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.763
|
||||||
|
Problem: Jumping to a mark does not open a fold if it is in the same line.
|
||||||
|
(Wiktor Ruben)
|
||||||
|
Solution: Also compare the column after the jump. (Christian Brabandt)
|
||||||
|
Files: src/normal.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.762/src/normal.c 2012-12-12 18:20:28.000000000 +0100
|
||||||
|
--- src/normal.c 2013-01-11 22:02:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7523,7529 ****
|
||||||
|
pos_T *pos;
|
||||||
|
int c;
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
! linenr_T lnum = curwin->w_cursor.lnum;
|
||||||
|
int old_KeyTyped = KeyTyped; /* getting file may reset it */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--- 7523,7529 ----
|
||||||
|
pos_T *pos;
|
||||||
|
int c;
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
! pos_T old_cursor = curwin->w_cursor;
|
||||||
|
int old_KeyTyped = KeyTyped; /* getting file may reset it */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 7552,7558 ****
|
||||||
|
#endif
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
if (cap->oap->op_type == OP_NOP
|
||||||
|
! && (pos == (pos_T *)-1 || lnum != curwin->w_cursor.lnum)
|
||||||
|
&& (fdo_flags & FDO_MARK)
|
||||||
|
&& old_KeyTyped)
|
||||||
|
foldOpenCursor();
|
||||||
|
--- 7552,7558 ----
|
||||||
|
#endif
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
if (cap->oap->op_type == OP_NOP
|
||||||
|
! && (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos))
|
||||||
|
&& (fdo_flags & FDO_MARK)
|
||||||
|
&& old_KeyTyped)
|
||||||
|
foldOpenCursor();
|
||||||
|
*** ../vim-7.3.762/src/version.c 2012-12-16 12:50:33.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 13:23:27.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 763,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
This is an airconditioned room, do not open Windows.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
175
7.3.764
Normal file
175
7.3.764
Normal file
@ -0,0 +1,175 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.764
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.764
|
||||||
|
Problem: Not all message translation files are installed.
|
||||||
|
Solution: Also install the converted files.
|
||||||
|
Files: src/po/Makefile
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.763/src/po/Makefile 2010-08-15 21:57:26.000000000 +0200
|
||||||
|
--- src/po/Makefile 2013-01-17 13:30:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 20,25 ****
|
||||||
|
--- 20,26 ----
|
||||||
|
ko \
|
||||||
|
ko.UTF-8 \
|
||||||
|
nb \
|
||||||
|
+ nl \
|
||||||
|
no \
|
||||||
|
pl \
|
||||||
|
pt_BR \
|
||||||
|
***************
|
||||||
|
*** 33,38 ****
|
||||||
|
--- 34,49 ----
|
||||||
|
zh_TW \
|
||||||
|
zh_TW.UTF-8
|
||||||
|
|
||||||
|
+ CONVERTED = \
|
||||||
|
+ cs.cp1250 \
|
||||||
|
+ ja.sjis \
|
||||||
|
+ pl.cp1250 \
|
||||||
|
+ pl.UTF-8 \
|
||||||
|
+ ru.cp1251 \
|
||||||
|
+ sk.cp1250 \
|
||||||
|
+ uk.cp1251 \
|
||||||
|
+ zh_CN.cp936
|
||||||
|
+
|
||||||
|
MOFILES = \
|
||||||
|
af.mo \
|
||||||
|
ca.mo \
|
||||||
|
***************
|
||||||
|
*** 49,54 ****
|
||||||
|
--- 60,66 ----
|
||||||
|
ko.mo \
|
||||||
|
ko.UTF-8.mo \
|
||||||
|
nb.mo \
|
||||||
|
+ nl.mo \
|
||||||
|
no.mo \
|
||||||
|
pl.mo \
|
||||||
|
pt_BR.mo \
|
||||||
|
***************
|
||||||
|
*** 62,68 ****
|
||||||
|
zh_TW.UTF-8.mo \
|
||||||
|
zh_TW.mo
|
||||||
|
|
||||||
|
! CONVERTED = \
|
||||||
|
cs.cp1250.mo \
|
||||||
|
ja.sjis.mo \
|
||||||
|
pl.cp1250.mo \
|
||||||
|
--- 74,80 ----
|
||||||
|
zh_TW.UTF-8.mo \
|
||||||
|
zh_TW.mo
|
||||||
|
|
||||||
|
! MOCONVERTED = \
|
||||||
|
cs.cp1250.mo \
|
||||||
|
ja.sjis.mo \
|
||||||
|
pl.cp1250.mo \
|
||||||
|
***************
|
||||||
|
*** 88,93 ****
|
||||||
|
--- 100,106 ----
|
||||||
|
ko.ck \
|
||||||
|
ko.UTF-8.ck \
|
||||||
|
nb.ck \
|
||||||
|
+ nl.ck \
|
||||||
|
no.ck \
|
||||||
|
pl.ck \
|
||||||
|
pt_BR.ck \
|
||||||
|
***************
|
||||||
|
*** 123,129 ****
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
.SUFFIXES: .po .mo .pot .ck
|
||||||
|
! .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES)
|
||||||
|
|
||||||
|
.po.mo:
|
||||||
|
$(MSGFMT) -o $@ $<
|
||||||
|
--- 136,142 ----
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
.SUFFIXES: .po .mo .pot .ck
|
||||||
|
! .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) $(CONVERTED)
|
||||||
|
|
||||||
|
.po.mo:
|
||||||
|
$(MSGFMT) -o $@ $<
|
||||||
|
***************
|
||||||
|
*** 132,144 ****
|
||||||
|
$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
! all: $(MOFILES)
|
||||||
|
|
||||||
|
check: $(CHECKFILES)
|
||||||
|
|
||||||
|
! install: $(MOFILES)
|
||||||
|
@$(MAKE) prefixcheck
|
||||||
|
! for lang in $(LANGUAGES); do \
|
||||||
|
dir=$(LOCALEDIR)/$$lang/; \
|
||||||
|
if test ! -x "$$dir"; then \
|
||||||
|
mkdir $$dir; chmod 755 $$dir; \
|
||||||
|
--- 145,157 ----
|
||||||
|
$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
|
||||||
|
touch $@
|
||||||
|
|
||||||
|
! all: $(MOFILES) $(MOCONVERTED)
|
||||||
|
|
||||||
|
check: $(CHECKFILES)
|
||||||
|
|
||||||
|
! install: $(MOFILES) $(MOCONVERTED)
|
||||||
|
@$(MAKE) prefixcheck
|
||||||
|
! for lang in $(LANGUAGES) $(CONVERTED); do \
|
||||||
|
dir=$(LOCALEDIR)/$$lang/; \
|
||||||
|
if test ! -x "$$dir"; then \
|
||||||
|
mkdir $$dir; chmod 755 $$dir; \
|
||||||
|
***************
|
||||||
|
*** 155,167 ****
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
@$(MAKE) prefixcheck
|
||||||
|
! for cat in $(MOFILES); do \
|
||||||
|
cat=`basename $$cat`; \
|
||||||
|
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
||||||
|
rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
|
||||||
|
done
|
||||||
|
|
||||||
|
! converted: $(CONVERTED)
|
||||||
|
|
||||||
|
# Norwegian/Bokmal: "nb" is an alias for "no".
|
||||||
|
# Copying the file is not efficient, but I don't know of another way to make
|
||||||
|
--- 168,180 ----
|
||||||
|
|
||||||
|
uninstall:
|
||||||
|
@$(MAKE) prefixcheck
|
||||||
|
! for cat in $(MOFILES) $(MOCONVERTED); do \
|
||||||
|
cat=`basename $$cat`; \
|
||||||
|
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
|
||||||
|
rm -f $(LOCALEDIR)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
|
||||||
|
done
|
||||||
|
|
||||||
|
! converted: $(MOCONVERTED)
|
||||||
|
|
||||||
|
# Norwegian/Bokmal: "nb" is an alias for "no".
|
||||||
|
# Copying the file is not efficient, but I don't know of another way to make
|
||||||
|
*** ../vim-7.3.763/src/version.c 2013-01-17 13:24:00.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 13:25:41.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 764,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
The software said it requires Windows 95 or better, so I installed Linux.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
98
7.3.765
Normal file
98
7.3.765
Normal file
@ -0,0 +1,98 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.765
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.765
|
||||||
|
Problem: Segfault when doing "cclose" on BufUnload in a python function.
|
||||||
|
(Sean Reifschneider)
|
||||||
|
Solution: Skip window with NULL buffer. (Christian Brabandt)
|
||||||
|
Files: src/main.c, src/window.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.764/src/main.c 2012-11-28 15:55:37.000000000 +0100
|
||||||
|
--- src/main.c 2013-01-17 13:46:57.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1376,1381 ****
|
||||||
|
--- 1376,1384 ----
|
||||||
|
for (wp = (tp == curtab)
|
||||||
|
? firstwin : tp->tp_firstwin; wp != NULL; wp = wp->w_next)
|
||||||
|
{
|
||||||
|
+ if (wp->w_buffer == NULL)
|
||||||
|
+ /* Autocmd must have close the buffer already, skip. */
|
||||||
|
+ continue;
|
||||||
|
buf = wp->w_buffer;
|
||||||
|
if (buf->b_changedtick != -1)
|
||||||
|
{
|
||||||
|
*** ../vim-7.3.764/src/window.c 2012-08-29 15:50:22.000000000 +0200
|
||||||
|
--- src/window.c 2013-01-17 13:53:10.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2276,2284 ****
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Autocommands may have closed the window already, or closed the only
|
||||||
|
* other window or moved to another tab page. */
|
||||||
|
! if (!win_valid(win) || last_window() || curtab != prev_curtab
|
||||||
|
|| close_last_window_tabpage(win, free_buf, prev_curtab))
|
||||||
|
return;
|
||||||
|
|
||||||
|
--- 2276,2290 ----
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (only_one_window() && win_valid(win) && win->w_buffer == NULL
|
||||||
|
+ && (last_window() || curtab != prev_curtab
|
||||||
|
+ || close_last_window_tabpage(win, free_buf, prev_curtab)))
|
||||||
|
+ /* Autocommands have close all windows, quit now. */
|
||||||
|
+ getout(0);
|
||||||
|
+
|
||||||
|
/* Autocommands may have closed the window already, or closed the only
|
||||||
|
* other window or moved to another tab page. */
|
||||||
|
! else if (!win_valid(win) || last_window() || curtab != prev_curtab
|
||||||
|
|| close_last_window_tabpage(win, free_buf, prev_curtab))
|
||||||
|
return;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 6282,6288 ****
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
for (wp = firstwin; wp != NULL; wp = wp->w_next)
|
||||||
|
! if ((!((wp->w_buffer->b_help && !curbuf->b_help)
|
||||||
|
# ifdef FEAT_QUICKFIX
|
||||||
|
|| wp->w_p_pvw
|
||||||
|
# endif
|
||||||
|
--- 6288,6295 ----
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
for (wp = firstwin; wp != NULL; wp = wp->w_next)
|
||||||
|
! if (wp->w_buffer != NULL
|
||||||
|
! && (!((wp->w_buffer->b_help && !curbuf->b_help)
|
||||||
|
# ifdef FEAT_QUICKFIX
|
||||||
|
|| wp->w_p_pvw
|
||||||
|
# endif
|
||||||
|
*** ../vim-7.3.764/src/version.c 2013-01-17 13:35:13.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 13:56:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 765,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
He was not in the least bit scared to be mashed into a pulp
|
||||||
|
Or to have his eyes gouged out and his elbows broken;
|
||||||
|
To have his kneecaps split and his body burned away
|
||||||
|
And his limbs all hacked and mangled, brave Sir Robin.
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
74
7.3.766
Normal file
74
7.3.766
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.766
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.766
|
||||||
|
Problem: ":help cpo-*" jumps to the wrong place.
|
||||||
|
Solution: Make it equivalent to ":help cpo-star".
|
||||||
|
Files: src/ex_cmds.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.765/src/ex_cmds.c 2012-11-29 20:09:55.000000000 +0100
|
||||||
|
--- src/ex_cmds.c 2013-01-17 14:05:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 5849,5862 ****
|
||||||
|
int i;
|
||||||
|
static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
|
||||||
|
"/*", "/\\*", "\"*", "**",
|
||||||
|
! "/\\(\\)",
|
||||||
|
"?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
|
||||||
|
"/\\?", "/\\z(\\)", "\\=", ":s\\=",
|
||||||
|
"[count]", "[quotex]", "[range]",
|
||||||
|
"[pattern]", "\\|", "\\%$"};
|
||||||
|
static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
|
||||||
|
"/star", "/\\\\star", "quotestar", "starstar",
|
||||||
|
! "/\\\\(\\\\)",
|
||||||
|
"?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
|
||||||
|
"/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
|
||||||
|
"\\[count]", "\\[quotex]", "\\[range]",
|
||||||
|
--- 5849,5862 ----
|
||||||
|
int i;
|
||||||
|
static char *(mtable[]) = {"*", "g*", "[*", "]*", ":*",
|
||||||
|
"/*", "/\\*", "\"*", "**",
|
||||||
|
! "cpo-*", "/\\(\\)",
|
||||||
|
"?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
|
||||||
|
"/\\?", "/\\z(\\)", "\\=", ":s\\=",
|
||||||
|
"[count]", "[quotex]", "[range]",
|
||||||
|
"[pattern]", "\\|", "\\%$"};
|
||||||
|
static char *(rtable[]) = {"star", "gstar", "[star", "]star", ":star",
|
||||||
|
"/star", "/\\\\star", "quotestar", "starstar",
|
||||||
|
! "cpo-star", "/\\\\(\\\\)",
|
||||||
|
"?", ":?", "?<CR>", "g?", "g?g?", "g??", "z?",
|
||||||
|
"/\\\\?", "/\\\\z(\\\\)", "\\\\=", ":s\\\\=",
|
||||||
|
"\\[count]", "\\[quotex]", "\\[range]",
|
||||||
|
*** ../vim-7.3.765/src/version.c 2013-01-17 13:59:56.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 14:09:04.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 766,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
The greatest lies of all time:
|
||||||
|
(1) The check is in the mail.
|
||||||
|
(2) We have a really challenging assignment for you.
|
||||||
|
(3) I love you.
|
||||||
|
(4) All bugs have been fixed.
|
||||||
|
(5) This won't hurt a bit.
|
||||||
|
(6) Honey, I just need to debug this program and be home in 5 minutes.
|
||||||
|
(7) I have just sent you an e-mail about that.
|
||||||
|
(8) Of course I'll respect you in the morning.
|
||||||
|
(9) I'm from the government, and I'm here to help you.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
120
7.3.767
Normal file
120
7.3.767
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.767
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.767
|
||||||
|
Problem: (Win32) The _errno used for iconv may be the wrong one.
|
||||||
|
Solution: Use the _errno from iconv.dll. (Ken Takata)
|
||||||
|
Files: src/mbyte.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.766/src/mbyte.c 2012-09-18 18:03:33.000000000 +0200
|
||||||
|
--- src/mbyte.c 2013-01-17 14:33:42.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3242,3248 ****
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Version of strnicmp() that handles multi-byte characters.
|
||||||
|
! * Needed for Big5, Sjift-JIS and UTF-8 encoding. Other DBCS encodings can
|
||||||
|
* probably use strnicmp(), because there are no ASCII characters in the
|
||||||
|
* second byte.
|
||||||
|
* Returns zero if s1 and s2 are equal (ignoring case), the difference between
|
||||||
|
--- 3242,3248 ----
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Version of strnicmp() that handles multi-byte characters.
|
||||||
|
! * Needed for Big5, Shift-JIS and UTF-8 encoding. Other DBCS encodings can
|
||||||
|
* probably use strnicmp(), because there are no ASCII characters in the
|
||||||
|
* second byte.
|
||||||
|
* Returns zero if s1 and s2 are equal (ignoring case), the difference between
|
||||||
|
***************
|
||||||
|
*** 4294,4299 ****
|
||||||
|
--- 4294,4337 ----
|
||||||
|
# endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * Get the address of 'funcname' which is imported by 'hInst' DLL.
|
||||||
|
+ */
|
||||||
|
+ static void *
|
||||||
|
+ get_iconv_import_func(HINSTANCE hInst, const char *funcname)
|
||||||
|
+ {
|
||||||
|
+ PBYTE pImage = (PBYTE)hInst;
|
||||||
|
+ PIMAGE_DOS_HEADER pDOS = (PIMAGE_DOS_HEADER)hInst;
|
||||||
|
+ PIMAGE_NT_HEADERS pPE;
|
||||||
|
+ PIMAGE_IMPORT_DESCRIPTOR pImpDesc;
|
||||||
|
+ PIMAGE_THUNK_DATA pIAT; /* Import Address Table */
|
||||||
|
+ PIMAGE_THUNK_DATA pINT; /* Import Name Table */
|
||||||
|
+ PIMAGE_IMPORT_BY_NAME pImpName;
|
||||||
|
+
|
||||||
|
+ if (pDOS->e_magic != IMAGE_DOS_SIGNATURE)
|
||||||
|
+ return NULL;
|
||||||
|
+ pPE = (PIMAGE_NT_HEADERS)(pImage + pDOS->e_lfanew);
|
||||||
|
+ if (pPE->Signature != IMAGE_NT_SIGNATURE)
|
||||||
|
+ return NULL;
|
||||||
|
+ pImpDesc = (PIMAGE_IMPORT_DESCRIPTOR)(pImage
|
||||||
|
+ + pPE->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT]
|
||||||
|
+ .VirtualAddress);
|
||||||
|
+ for (; pImpDesc->FirstThunk; ++pImpDesc)
|
||||||
|
+ {
|
||||||
|
+ pIAT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->FirstThunk);
|
||||||
|
+ pINT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->OriginalFirstThunk);
|
||||||
|
+ for (; pIAT->u1.Function; ++pIAT, ++pINT)
|
||||||
|
+ {
|
||||||
|
+ if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
|
||||||
|
+ continue;
|
||||||
|
+ pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage + pINT->u1.AddressOfData);
|
||||||
|
+ if (strcmp(pImpName->Name, funcname) == 0)
|
||||||
|
+ return (void *)pIAT->u1.Function;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
* Try opening the iconv.dll and return TRUE if iconv() can be used.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
***************
|
||||||
|
*** 4326,4332 ****
|
||||||
|
iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open");
|
||||||
|
iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close");
|
||||||
|
iconvctl = (void *)GetProcAddress(hIconvDLL, "libiconvctl");
|
||||||
|
! iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno");
|
||||||
|
if (iconv == NULL || iconv_open == NULL || iconv_close == NULL
|
||||||
|
|| iconvctl == NULL || iconv_errno == NULL)
|
||||||
|
{
|
||||||
|
--- 4364,4372 ----
|
||||||
|
iconv_open = (void *)GetProcAddress(hIconvDLL, "libiconv_open");
|
||||||
|
iconv_close = (void *)GetProcAddress(hIconvDLL, "libiconv_close");
|
||||||
|
iconvctl = (void *)GetProcAddress(hIconvDLL, "libiconvctl");
|
||||||
|
! iconv_errno = get_iconv_import_func(hIconvDLL, "_errno");
|
||||||
|
! if (iconv_errno == NULL)
|
||||||
|
! iconv_errno = (void *)GetProcAddress(hMsvcrtDLL, "_errno");
|
||||||
|
if (iconv == NULL || iconv_open == NULL || iconv_close == NULL
|
||||||
|
|| iconvctl == NULL || iconv_errno == NULL)
|
||||||
|
{
|
||||||
|
*** ../vim-7.3.766/src/version.c 2013-01-17 14:09:39.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 14:34:19.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 767,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
FIRST HEAD: Oh! quick! get the sword out I want to cut his head off.
|
||||||
|
THIRD HEAD: Oh, cut your own head off.
|
||||||
|
SECOND HEAD: Yes - do us all a favour.
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
68
7.3.768
Normal file
68
7.3.768
Normal file
@ -0,0 +1,68 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.768
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.768
|
||||||
|
Problem: settabvar() and setwinvar() may move the cursor.
|
||||||
|
Solution: Save and restore the cursor position when appropriate. (idea by
|
||||||
|
Yasuhiro Matsumoto)
|
||||||
|
Files: src/edit.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.767/src/edit.c 2012-10-21 00:10:29.000000000 +0200
|
||||||
|
--- src/edit.c 2013-01-17 15:32:10.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 372,377 ****
|
||||||
|
--- 372,379 ----
|
||||||
|
*/
|
||||||
|
if (cmdchar != 'r' && cmdchar != 'v')
|
||||||
|
{
|
||||||
|
+ pos_T save_cursor = curwin->w_cursor;
|
||||||
|
+
|
||||||
|
# ifdef FEAT_EVAL
|
||||||
|
if (cmdchar == 'R')
|
||||||
|
ptr = (char_u *)"r";
|
||||||
|
***************
|
||||||
|
*** 382,387 ****
|
||||||
|
--- 384,402 ----
|
||||||
|
set_vim_var_string(VV_INSERTMODE, ptr, 1);
|
||||||
|
# endif
|
||||||
|
apply_autocmds(EVENT_INSERTENTER, NULL, NULL, FALSE, curbuf);
|
||||||
|
+
|
||||||
|
+ /* Since Insert mode was not started yet a call to check_cursor_col()
|
||||||
|
+ * may have moved the cursor, especially with the "A" command. */
|
||||||
|
+ if (curwin->w_cursor.col != save_cursor.col
|
||||||
|
+ && curwin->w_cursor.lnum == save_cursor.lnum)
|
||||||
|
+ {
|
||||||
|
+ int save_state = State;
|
||||||
|
+
|
||||||
|
+ curwin->w_cursor = save_cursor;
|
||||||
|
+ State = INSERT;
|
||||||
|
+ check_cursor_col();
|
||||||
|
+ State = save_state;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
*** ../vim-7.3.767/src/version.c 2013-01-17 14:39:43.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 15:10:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 768,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Life would be so much easier if we could just look at the source code.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
450
7.3.769
Normal file
450
7.3.769
Normal file
@ -0,0 +1,450 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.769
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.769
|
||||||
|
Problem: 'matchpairs' does not work with multi-byte characters.
|
||||||
|
Solution: Make it work. (Christian Brabandt)
|
||||||
|
Files: src/misc1.c, src/option.c, src/proto/option.pro, src/search.c,
|
||||||
|
src/testdir/test69.in, src/testdir/test69.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.768/src/misc1.c 2012-08-15 14:04:50.000000000 +0200
|
||||||
|
--- src/misc1.c 2013-01-17 15:55:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2288,2301 ****
|
||||||
|
*/
|
||||||
|
if (p_sm && (State & INSERT)
|
||||||
|
&& msg_silent == 0
|
||||||
|
- #ifdef FEAT_MBYTE
|
||||||
|
- && charlen == 1
|
||||||
|
- #endif
|
||||||
|
#ifdef FEAT_INS_EXPAND
|
||||||
|
&& !ins_compl_active()
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
! showmatch(c);
|
||||||
|
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
if (!p_ri || (State & REPLACE_FLAG))
|
||||||
|
--- 2288,2305 ----
|
||||||
|
*/
|
||||||
|
if (p_sm && (State & INSERT)
|
||||||
|
&& msg_silent == 0
|
||||||
|
#ifdef FEAT_INS_EXPAND
|
||||||
|
&& !ins_compl_active()
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
! {
|
||||||
|
! #ifdef FEAT_MBYTE
|
||||||
|
! if (has_mbyte)
|
||||||
|
! showmatch(mb_ptr2char(buf));
|
||||||
|
! else
|
||||||
|
! #endif
|
||||||
|
! showmatch(c);
|
||||||
|
! }
|
||||||
|
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
if (!p_ri || (State & REPLACE_FLAG))
|
||||||
|
*** ../vim-7.3.768/src/option.c 2012-12-05 14:42:56.000000000 +0100
|
||||||
|
--- src/option.c 2013-01-17 16:38:42.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 6149,6164 ****
|
||||||
|
/* 'matchpairs' */
|
||||||
|
else if (gvarp == &p_mps)
|
||||||
|
{
|
||||||
|
! /* Check for "x:y,x:y" */
|
||||||
|
! for (p = *varp; *p != NUL; p += 4)
|
||||||
|
{
|
||||||
|
! if (p[1] != ':' || p[2] == NUL || (p[3] != NUL && p[3] != ','))
|
||||||
|
{
|
||||||
|
! errmsg = e_invarg;
|
||||||
|
! break;
|
||||||
|
}
|
||||||
|
- if (p[3] == NUL)
|
||||||
|
- break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 6149,6194 ----
|
||||||
|
/* 'matchpairs' */
|
||||||
|
else if (gvarp == &p_mps)
|
||||||
|
{
|
||||||
|
! #ifdef FEAT_MBYTE
|
||||||
|
! if (has_mbyte)
|
||||||
|
{
|
||||||
|
! for (p = *varp; *p != NUL; ++p)
|
||||||
|
{
|
||||||
|
! int x2,x3 = -1;
|
||||||
|
!
|
||||||
|
! if (*p != NUL)
|
||||||
|
! p += mb_ptr2len(p);
|
||||||
|
! if (*p != NUL)
|
||||||
|
! x2 = *p++;
|
||||||
|
! if (*p != NUL)
|
||||||
|
! {
|
||||||
|
! x3 = mb_ptr2char(p);
|
||||||
|
! p += mb_ptr2len(p);
|
||||||
|
! }
|
||||||
|
! if (x2 != ':' || x2 == -1 || x3 == -1
|
||||||
|
! || (*p != NUL && *p != ','))
|
||||||
|
! {
|
||||||
|
! errmsg = e_invarg;
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! if (*p == NUL)
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! }
|
||||||
|
! else
|
||||||
|
! #endif
|
||||||
|
! {
|
||||||
|
! /* Check for "x:y,x:y" */
|
||||||
|
! for (p = *varp; *p != NUL; p += 4)
|
||||||
|
! {
|
||||||
|
! if (p[1] != ':' || p[2] == NUL || (p[3] != NUL && p[3] != ','))
|
||||||
|
! {
|
||||||
|
! errmsg = e_invarg;
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! if (p[3] == NUL)
|
||||||
|
! break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 11453,11455 ****
|
||||||
|
--- 11483,11583 ----
|
||||||
|
{
|
||||||
|
return curbuf->b_p_sts < 0 ? get_sw_value() : curbuf->b_p_sts;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
+ * Check matchpairs option for "*initc".
|
||||||
|
+ * If there is a match set "*initc" to the matching character and "*findc" to
|
||||||
|
+ * the opposite character. Set "*backwards" to the direction.
|
||||||
|
+ * When "switchit" is TRUE swap the direction.
|
||||||
|
+ */
|
||||||
|
+ void
|
||||||
|
+ find_mps_values(initc, findc, backwards, switchit)
|
||||||
|
+ int *initc;
|
||||||
|
+ int *findc;
|
||||||
|
+ int *backwards;
|
||||||
|
+ int switchit;
|
||||||
|
+ {
|
||||||
|
+ char_u *ptr;
|
||||||
|
+
|
||||||
|
+ ptr = curbuf->b_p_mps;
|
||||||
|
+ while (*ptr != NUL)
|
||||||
|
+ {
|
||||||
|
+ #ifdef FEAT_MBYTE
|
||||||
|
+ if (has_mbyte)
|
||||||
|
+ {
|
||||||
|
+ char_u *prev;
|
||||||
|
+
|
||||||
|
+ if (mb_ptr2char(ptr) == *initc)
|
||||||
|
+ {
|
||||||
|
+ if (switchit)
|
||||||
|
+ {
|
||||||
|
+ *findc = *initc;
|
||||||
|
+ *initc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1);
|
||||||
|
+ *backwards = TRUE;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ *findc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1);
|
||||||
|
+ *backwards = FALSE;
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ prev = ptr;
|
||||||
|
+ ptr += mb_ptr2len(ptr) + 1;
|
||||||
|
+ if (mb_ptr2char(ptr) == *initc)
|
||||||
|
+ {
|
||||||
|
+ if (switchit)
|
||||||
|
+ {
|
||||||
|
+ *findc = *initc;
|
||||||
|
+ *initc = mb_ptr2char(prev);
|
||||||
|
+ *backwards = FALSE;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ *findc = mb_ptr2char(prev);
|
||||||
|
+ *backwards = TRUE;
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ ptr += mb_ptr2len(ptr);
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ #endif
|
||||||
|
+ {
|
||||||
|
+ if (*ptr == *initc)
|
||||||
|
+ {
|
||||||
|
+ if (switchit)
|
||||||
|
+ {
|
||||||
|
+ *backwards = TRUE;
|
||||||
|
+ *findc = *initc;
|
||||||
|
+ *initc = ptr[2];
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ *backwards = FALSE;
|
||||||
|
+ *findc = ptr[2];
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ ptr += 2;
|
||||||
|
+ if (*ptr == *initc)
|
||||||
|
+ {
|
||||||
|
+ if (switchit)
|
||||||
|
+ {
|
||||||
|
+ *backwards = FALSE;
|
||||||
|
+ *findc = *initc;
|
||||||
|
+ *initc = ptr[-2];
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ *backwards = TRUE;
|
||||||
|
+ *findc = ptr[-2];
|
||||||
|
+ }
|
||||||
|
+ return;
|
||||||
|
+ }
|
||||||
|
+ ++ptr;
|
||||||
|
+ }
|
||||||
|
+ if (*ptr == ',')
|
||||||
|
+ ++ptr;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
*** ../vim-7.3.768/src/proto/option.pro 2012-12-05 14:42:56.000000000 +0100
|
||||||
|
--- src/proto/option.pro 2013-01-17 16:39:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 59,62 ****
|
||||||
|
--- 59,63 ----
|
||||||
|
int check_ff_value __ARGS((char_u *p));
|
||||||
|
long get_sw_value __ARGS((void));
|
||||||
|
long get_sts_value __ARGS((void));
|
||||||
|
+ void find_mps_values __ARGS((int *initc, int *findc, int *backwards, int switchit));
|
||||||
|
/* vim: set ft=c : */
|
||||||
|
*** ../vim-7.3.768/src/search.c 2012-10-03 13:35:45.000000000 +0200
|
||||||
|
--- src/search.c 2013-01-17 16:50:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1786,1813 ****
|
||||||
|
}
|
||||||
|
else if (initc != '#' && initc != NUL)
|
||||||
|
{
|
||||||
|
! /* 'matchpairs' is "x:y,x:y" */
|
||||||
|
! for (ptr = curbuf->b_p_mps; *ptr; ptr += 2)
|
||||||
|
! {
|
||||||
|
! if (*ptr == initc)
|
||||||
|
! {
|
||||||
|
! findc = initc;
|
||||||
|
! initc = ptr[2];
|
||||||
|
! backwards = TRUE;
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! ptr += 2;
|
||||||
|
! if (*ptr == initc)
|
||||||
|
! {
|
||||||
|
! findc = initc;
|
||||||
|
! initc = ptr[-2];
|
||||||
|
! backwards = FALSE;
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! if (ptr[1] != ',')
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! if (!findc) /* invalid initc! */
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
--- 1786,1793 ----
|
||||||
|
}
|
||||||
|
else if (initc != '#' && initc != NUL)
|
||||||
|
{
|
||||||
|
! find_mps_values(&initc, &findc, &backwards, TRUE);
|
||||||
|
! if (findc == NUL)
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
***************
|
||||||
|
*** 1886,1921 ****
|
||||||
|
--pos.col;
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
! initc = linep[pos.col];
|
||||||
|
if (initc == NUL)
|
||||||
|
break;
|
||||||
|
|
||||||
|
! for (ptr = curbuf->b_p_mps; *ptr; ++ptr)
|
||||||
|
! {
|
||||||
|
! if (*ptr == initc)
|
||||||
|
! {
|
||||||
|
! findc = ptr[2];
|
||||||
|
! backwards = FALSE;
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! ptr += 2;
|
||||||
|
! if (*ptr == initc)
|
||||||
|
! {
|
||||||
|
! findc = ptr[-2];
|
||||||
|
! backwards = TRUE;
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
! if (!*++ptr)
|
||||||
|
! break;
|
||||||
|
! }
|
||||||
|
if (findc)
|
||||||
|
break;
|
||||||
|
! #ifdef FEAT_MBYTE
|
||||||
|
! if (has_mbyte)
|
||||||
|
! pos.col += (*mb_ptr2len)(linep + pos.col);
|
||||||
|
! else
|
||||||
|
! #endif
|
||||||
|
! ++pos.col;
|
||||||
|
}
|
||||||
|
if (!findc)
|
||||||
|
{
|
||||||
|
--- 1866,1879 ----
|
||||||
|
--pos.col;
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
! initc = PTR2CHAR(linep + pos.col);
|
||||||
|
if (initc == NUL)
|
||||||
|
break;
|
||||||
|
|
||||||
|
! find_mps_values(&initc, &findc, &backwards, FALSE);
|
||||||
|
if (findc)
|
||||||
|
break;
|
||||||
|
! pos.col += MB_PTR2LEN(linep + pos.col);
|
||||||
|
}
|
||||||
|
if (!findc)
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 2260,2266 ****
|
||||||
|
* inquote if the number of quotes in a line is even, unless this
|
||||||
|
* line or the previous one ends in a '\'. Complicated, isn't it?
|
||||||
|
*/
|
||||||
|
! switch (c = linep[pos.col])
|
||||||
|
{
|
||||||
|
case NUL:
|
||||||
|
/* at end of line without trailing backslash, reset inquote */
|
||||||
|
--- 2218,2225 ----
|
||||||
|
* inquote if the number of quotes in a line is even, unless this
|
||||||
|
* line or the previous one ends in a '\'. Complicated, isn't it?
|
||||||
|
*/
|
||||||
|
! c = PTR2CHAR(linep + pos.col);
|
||||||
|
! switch (c)
|
||||||
|
{
|
||||||
|
case NUL:
|
||||||
|
/* at end of line without trailing backslash, reset inquote */
|
||||||
|
***************
|
||||||
|
*** 2469,2488 ****
|
||||||
|
* Only show match for chars in the 'matchpairs' option.
|
||||||
|
*/
|
||||||
|
/* 'matchpairs' is "x:y,x:y" */
|
||||||
|
! for (p = curbuf->b_p_mps; *p != NUL; p += 2)
|
||||||
|
{
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
! if (*p == c && (curwin->w_p_rl ^ p_ri))
|
||||||
|
! break;
|
||||||
|
#endif
|
||||||
|
! p += 2;
|
||||||
|
! if (*p == c
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
&& !(curwin->w_p_rl ^ p_ri)
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
break;
|
||||||
|
! if (p[1] != ',')
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 2428,2450 ----
|
||||||
|
* Only show match for chars in the 'matchpairs' option.
|
||||||
|
*/
|
||||||
|
/* 'matchpairs' is "x:y,x:y" */
|
||||||
|
! for (p = curbuf->b_p_mps; *p != NUL; ++p)
|
||||||
|
{
|
||||||
|
+ if (PTR2CHAR(p) == c
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
! && (curwin->w_p_rl ^ p_ri)
|
||||||
|
#endif
|
||||||
|
! )
|
||||||
|
! break;
|
||||||
|
! p += MB_PTR2LEN(p) + 1;
|
||||||
|
! if (PTR2CHAR(p) == c
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
&& !(curwin->w_p_rl ^ p_ri)
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
break;
|
||||||
|
! p += MB_PTR2LEN(p);
|
||||||
|
! if (*p == NUL)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
*** ../vim-7.3.768/src/testdir/test69.in 2010-08-15 21:57:29.000000000 +0200
|
||||||
|
--- src/testdir/test69.in 2013-01-17 15:55:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1,4 ****
|
||||||
|
--- 1,5 ----
|
||||||
|
Test for multi-byte text formatting.
|
||||||
|
+ Also test, that 'mps' with multibyte chars works.
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
:so mbyte.vim
|
||||||
|
***************
|
||||||
|
*** 134,139 ****
|
||||||
|
--- 135,149 ----
|
||||||
|
}
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
+ /^{/+1
|
||||||
|
+ :set mps+=u2018:u2019
|
||||||
|
+ d%
|
||||||
|
+ ENDTEST
|
||||||
|
+
|
||||||
|
+ {
|
||||||
|
+ ‘ two three ’ four
|
||||||
|
+ }
|
||||||
|
+ STARTTEST
|
||||||
|
:g/^STARTTEST/.,/^ENDTEST/d
|
||||||
|
:1;/^Results/,$wq! test.out
|
||||||
|
ENDTEST
|
||||||
|
*** ../vim-7.3.768/src/testdir/test69.ok 2010-08-15 21:57:29.000000000 +0200
|
||||||
|
--- src/testdir/test69.ok 2013-01-17 15:55:09.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 140,142 ****
|
||||||
|
--- 140,146 ----
|
||||||
|
a
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+ {
|
||||||
|
+ four
|
||||||
|
+ }
|
||||||
|
*** ../vim-7.3.768/src/version.c 2013-01-17 15:36:54.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 15:55:49.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 769,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Microsoft's definition of a boolean: TRUE, FALSE, MAYBE
|
||||||
|
"Embrace and extend"...?
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
136
7.3.770
Normal file
136
7.3.770
Normal file
@ -0,0 +1,136 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.770
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.770
|
||||||
|
Problem: Vim.h indentation is inconsistent.
|
||||||
|
Solution: Adjust the indentation. (Elias Diem)
|
||||||
|
Files: src/vim.h
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.769/src/vim.h 2012-08-15 14:04:50.000000000 +0200
|
||||||
|
--- src/vim.h 2013-01-17 17:12:54.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 104,110 ****
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#if defined(MACOS_X) || defined(MACOS_CLASSIC)
|
||||||
|
! # define MACOS
|
||||||
|
#endif
|
||||||
|
#if defined(MACOS_X) && defined(MACOS_CLASSIC)
|
||||||
|
Error: To compile for both MACOS X and Classic use a Classic Carbon
|
||||||
|
--- 104,110 ----
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#if defined(MACOS_X) || defined(MACOS_CLASSIC)
|
||||||
|
! # define MACOS
|
||||||
|
#endif
|
||||||
|
#if defined(MACOS_X) && defined(MACOS_CLASSIC)
|
||||||
|
Error: To compile for both MACOS X and Classic use a Classic Carbon
|
||||||
|
***************
|
||||||
|
*** 490,496 ****
|
||||||
|
# include <string.h>
|
||||||
|
# endif
|
||||||
|
# if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H)
|
||||||
|
! # include <strings.h>
|
||||||
|
# endif
|
||||||
|
# ifdef HAVE_STAT_H
|
||||||
|
# include <stat.h>
|
||||||
|
--- 490,496 ----
|
||||||
|
# include <string.h>
|
||||||
|
# endif
|
||||||
|
# if defined(HAVE_STRINGS_H) && !defined(NO_STRINGS_WITH_STRING_H)
|
||||||
|
! # include <strings.h>
|
||||||
|
# endif
|
||||||
|
# ifdef HAVE_STAT_H
|
||||||
|
# include <stat.h>
|
||||||
|
***************
|
||||||
|
*** 515,536 ****
|
||||||
|
# include <stdarg.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! # if defined(HAVE_SYS_SELECT_H) && \
|
||||||
|
(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
|
||||||
|
! # include <sys/select.h>
|
||||||
|
! # endif
|
||||||
|
|
||||||
|
! # ifndef HAVE_SELECT
|
||||||
|
! # ifdef HAVE_SYS_POLL_H
|
||||||
|
! # include <sys/poll.h>
|
||||||
|
# define HAVE_POLL
|
||||||
|
- # else
|
||||||
|
- # ifdef HAVE_POLL_H
|
||||||
|
- # include <poll.h>
|
||||||
|
- # define HAVE_POLL
|
||||||
|
- # endif
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
|
||||||
|
/* ================ end of the header file puzzle =============== */
|
||||||
|
|
||||||
|
--- 515,536 ----
|
||||||
|
# include <stdarg.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! #if defined(HAVE_SYS_SELECT_H) && \
|
||||||
|
(!defined(HAVE_SYS_TIME_H) || defined(SYS_SELECT_WITH_SYS_TIME))
|
||||||
|
! # include <sys/select.h>
|
||||||
|
! #endif
|
||||||
|
|
||||||
|
! #ifndef HAVE_SELECT
|
||||||
|
! # ifdef HAVE_SYS_POLL_H
|
||||||
|
! # include <sys/poll.h>
|
||||||
|
! # define HAVE_POLL
|
||||||
|
! # else
|
||||||
|
! # ifdef HAVE_POLL_H
|
||||||
|
! # include <poll.h>
|
||||||
|
# define HAVE_POLL
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
/* ================ end of the header file puzzle =============== */
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 1877,1884 ****
|
||||||
|
/* VIM_ATOM_NAME is the older Vim-specific selection type for X11. Still
|
||||||
|
* supported for when a mix of Vim versions is used. VIMENC_ATOM_NAME includes
|
||||||
|
* the encoding to support Vims using different 'encoding' values. */
|
||||||
|
! #define VIM_ATOM_NAME "_VIM_TEXT"
|
||||||
|
! #define VIMENC_ATOM_NAME "_VIMENC_TEXT"
|
||||||
|
|
||||||
|
/* Selection states for modeless selection */
|
||||||
|
# define SELECT_CLEARED 0
|
||||||
|
--- 1877,1884 ----
|
||||||
|
/* VIM_ATOM_NAME is the older Vim-specific selection type for X11. Still
|
||||||
|
* supported for when a mix of Vim versions is used. VIMENC_ATOM_NAME includes
|
||||||
|
* the encoding to support Vims using different 'encoding' values. */
|
||||||
|
! # define VIM_ATOM_NAME "_VIM_TEXT"
|
||||||
|
! # define VIMENC_ATOM_NAME "_VIMENC_TEXT"
|
||||||
|
|
||||||
|
/* Selection states for modeless selection */
|
||||||
|
# define SELECT_CLEARED 0
|
||||||
|
*** ../vim-7.3.769/src/version.c 2013-01-17 17:01:57.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 17:16:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 770,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
FIRST HEAD: All right! All right! We'll kill him first and then have tea and
|
||||||
|
biscuits.
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
74
7.3.771
Normal file
74
7.3.771
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.771
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.771 (after 7.3.769)
|
||||||
|
Problem: Uninitialized variable. (Yasuhiro Matsumoto)
|
||||||
|
Solution: Set x2 to -1.
|
||||||
|
Files: src/option.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.770/src/option.c 2013-01-17 17:01:56.000000000 +0100
|
||||||
|
--- src/option.c 2013-01-17 17:31:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 6154,6160 ****
|
||||||
|
{
|
||||||
|
for (p = *varp; *p != NUL; ++p)
|
||||||
|
{
|
||||||
|
! int x2,x3 = -1;
|
||||||
|
|
||||||
|
if (*p != NUL)
|
||||||
|
p += mb_ptr2len(p);
|
||||||
|
--- 6154,6161 ----
|
||||||
|
{
|
||||||
|
for (p = *varp; *p != NUL; ++p)
|
||||||
|
{
|
||||||
|
! int x2 = -1;
|
||||||
|
! int x3 = -1;
|
||||||
|
|
||||||
|
if (*p != NUL)
|
||||||
|
p += mb_ptr2len(p);
|
||||||
|
***************
|
||||||
|
*** 6165,6172 ****
|
||||||
|
x3 = mb_ptr2char(p);
|
||||||
|
p += mb_ptr2len(p);
|
||||||
|
}
|
||||||
|
! if (x2 != ':' || x2 == -1 || x3 == -1
|
||||||
|
! || (*p != NUL && *p != ','))
|
||||||
|
{
|
||||||
|
errmsg = e_invarg;
|
||||||
|
break;
|
||||||
|
--- 6166,6172 ----
|
||||||
|
x3 = mb_ptr2char(p);
|
||||||
|
p += mb_ptr2len(p);
|
||||||
|
}
|
||||||
|
! if (x2 != ':' || x3 == -1 || (*p != NUL && *p != ','))
|
||||||
|
{
|
||||||
|
errmsg = e_invarg;
|
||||||
|
break;
|
||||||
|
*** ../vim-7.3.770/src/version.c 2013-01-17 17:17:21.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 17:37:24.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 771,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
GALAHAD turns back. We see from his POV the lovely ZOOT standing by him
|
||||||
|
smiling enchantingly and a number of equally delectable GIRLIES draped
|
||||||
|
around in the seductively poulticed room. They look at him smilingly and
|
||||||
|
wave.
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
51
7.3.772
Normal file
51
7.3.772
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.772
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.772
|
||||||
|
Problem: Cursor is at the wrong location and below the end of the file
|
||||||
|
after doing substitutions with confirm flag: %s/x/y/c
|
||||||
|
(Dominique Pelle)
|
||||||
|
Solution: Update the cursor position. (Christian Brabandt & Dominique)
|
||||||
|
Files: src/ex_cmds.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.771/src/ex_cmds.c 2013-01-17 14:09:39.000000000 +0100
|
||||||
|
--- src/ex_cmds.c 2013-01-17 18:31:38.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 5200,5205 ****
|
||||||
|
--- 5200,5211 ----
|
||||||
|
EMSG2(_(e_patnotf2), get_search_pat());
|
||||||
|
}
|
||||||
|
|
||||||
|
+ #ifdef FEAT_FOLDING
|
||||||
|
+ if (do_ask && hasAnyFolding(curwin))
|
||||||
|
+ /* Cursor position may require updating */
|
||||||
|
+ changed_window_setting();
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
vim_free(regmatch.regprog);
|
||||||
|
}
|
||||||
|
|
||||||
|
*** ../vim-7.3.771/src/version.c 2013-01-17 17:37:31.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-17 18:32:56.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 772,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Linux is just like a wigwam: no Windows, no Gates and an Apache inside.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
45
7.3.773
Normal file
45
7.3.773
Normal file
@ -0,0 +1,45 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.773
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.773 (after 7.3.767)
|
||||||
|
Problem: Crash when OriginalFirstThunk is zero.
|
||||||
|
Solution: Skip items with OriginalFirstThunk not set. (Ken Takata)
|
||||||
|
Files: src/mbyte.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.772/src/mbyte.c 2013-01-17 14:39:43.000000000 +0100
|
||||||
|
--- src/mbyte.c 2013-01-19 13:59:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4317,4322 ****
|
||||||
|
--- 4317,4324 ----
|
||||||
|
.VirtualAddress);
|
||||||
|
for (; pImpDesc->FirstThunk; ++pImpDesc)
|
||||||
|
{
|
||||||
|
+ if (!pImpDesc->OriginalFirstThunk)
|
||||||
|
+ continue;
|
||||||
|
pIAT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->FirstThunk);
|
||||||
|
pINT = (PIMAGE_THUNK_DATA)(pImage + pImpDesc->OriginalFirstThunk);
|
||||||
|
for (; pIAT->u1.Function; ++pIAT, ++pINT)
|
||||||
|
*** ../vim-7.3.772/src/version.c 2013-01-17 18:33:58.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-19 14:01:50.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 773,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Experience is what you get when you don't get what you want.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
84
7.3.774
Normal file
84
7.3.774
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.774
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.774
|
||||||
|
Problem: Tiny GUI version misses console dialog feature.
|
||||||
|
Solution: Define FEAT_CON_DIALOG when apprpriate. (Christian Brabandt)
|
||||||
|
Files: src/feature.h, src/gui.h
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.773/src/feature.h 2012-10-21 02:17:28.000000000 +0200
|
||||||
|
--- src/feature.h 2013-01-23 13:33:52.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 792,797 ****
|
||||||
|
--- 792,806 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
+ * On some systems, when we compile with the GUI, we always use it. On Mac
|
||||||
|
+ * there is no terminal version, and on Windows we can't figure out how to
|
||||||
|
+ * fork one off with :gui.
|
||||||
|
+ */
|
||||||
|
+ #if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX))
|
||||||
|
+ # define ALWAYS_USE_GUI
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
+ /*
|
||||||
|
* +dialog_gui Use GUI dialog.
|
||||||
|
* +dialog_con May use Console dialog.
|
||||||
|
* When none of these defined there is no dialog support.
|
||||||
|
***************
|
||||||
|
*** 820,825 ****
|
||||||
|
--- 829,837 ----
|
||||||
|
|| defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) \
|
||||||
|
|| defined(FEAT_GUI_PHOTON) || defined(FEAT_GUI_MAC))
|
||||||
|
# define FEAT_GUI_TEXTDIALOG
|
||||||
|
+ # ifndef ALWAYS_USE_GUI
|
||||||
|
+ # define FEAT_CON_DIALOG
|
||||||
|
+ # endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Mac specific thing: Codewarrior interface. */
|
||||||
|
*** ../vim-7.3.773/src/gui.h 2011-06-26 04:48:56.000000000 +0200
|
||||||
|
--- src/gui.h 2013-01-23 13:33:24.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 59,73 ****
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
- * On some systems, when we compile with the GUI, we always use it. On Mac
|
||||||
|
- * there is no terminal version, and on Windows we can't figure out how to
|
||||||
|
- * fork one off with :gui.
|
||||||
|
- */
|
||||||
|
- #if defined(FEAT_GUI_MSWIN) || (defined(FEAT_GUI_MAC) && !defined(MACOS_X_UNIX))
|
||||||
|
- # define ALWAYS_USE_GUI
|
||||||
|
- #endif
|
||||||
|
-
|
||||||
|
- /*
|
||||||
|
* On some systems scrolling needs to be done right away instead of in the
|
||||||
|
* main loop.
|
||||||
|
*/
|
||||||
|
--- 59,64 ----
|
||||||
|
*** ../vim-7.3.773/src/version.c 2013-01-19 14:01:57.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 13:38:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 774,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Overflow on /dev/null, please empty the bit bucket.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
72
7.3.775
Normal file
72
7.3.775
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.775
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.775
|
||||||
|
Problem: Cygwin and Mingw builds miss dependency on gui_w48.c.
|
||||||
|
Solution: Add a build rule. (Ken Takata)
|
||||||
|
Files: src/Make_cyg.mak, src/Make_ming.mak
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.774/src/Make_cyg.mak 2012-11-28 16:18:26.000000000 +0100
|
||||||
|
--- src/Make_cyg.mak 2013-01-23 13:53:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 600,605 ****
|
||||||
|
--- 600,608 ----
|
||||||
|
$(OUTDIR)/ex_eval.o: ex_eval.c $(INCL) ex_cmds.h
|
||||||
|
$(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
|
||||||
|
|
||||||
|
+ $(OUTDIR)/gui_w32.o: gui_w32.c gui_w48.c $(INCL)
|
||||||
|
+ $(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
|
||||||
|
+
|
||||||
|
$(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
|
||||||
|
$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
|
||||||
|
|
||||||
|
*** ../vim-7.3.774/src/Make_ming.mak 2012-11-28 16:18:26.000000000 +0100
|
||||||
|
--- src/Make_ming.mak 2013-01-23 13:53:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 731,736 ****
|
||||||
|
--- 731,739 ----
|
||||||
|
$(OUTDIR)/ex_eval.o: ex_eval.c $(INCL) ex_cmds.h
|
||||||
|
$(CC) -c $(CFLAGS) ex_eval.c -o $(OUTDIR)/ex_eval.o
|
||||||
|
|
||||||
|
+ $(OUTDIR)/gui_w32.o: gui_w32.c gui_w48.c $(INCL)
|
||||||
|
+ $(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
|
||||||
|
+
|
||||||
|
$(OUTDIR)/if_cscope.o: if_cscope.c $(INCL) if_cscope.h
|
||||||
|
$(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
|
||||||
|
|
||||||
|
*** ../vim-7.3.774/src/version.c 2013-01-23 13:40:54.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 13:53:34.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 775,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
** Hello and Welcome to the Psychiatric Hotline **
|
||||||
|
If you are obsessive-compulsive, please press 1 repeatedly.
|
||||||
|
If you are co-dependent, please ask someone to press 2.
|
||||||
|
If you have multiple personalities, please press 3, 4, 5 and 6.
|
||||||
|
If you are paranoid-delusional, we know who you are and what you want
|
||||||
|
- just stay on the line so we can trace the call.
|
||||||
|
If you are schizophrenic, listen carefully and a little voice will
|
||||||
|
tell you which number to press next.
|
||||||
|
If you are manic-depressive, it doesn't matter which number you press
|
||||||
|
- no one will answer.
|
||||||
|
If you suffer from panic attacks, push every button you can find.
|
||||||
|
If you are sane, please hold on - we have the rest of humanity on the
|
||||||
|
other line and they desparately want to ask you a few questions.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
435
7.3.776
Normal file
435
7.3.776
Normal file
@ -0,0 +1,435 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.776
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.776
|
||||||
|
Problem: ml_get error when searching, caused by curwin not matching curbuf.
|
||||||
|
Solution: Avoid changing curbuf. (Lech Lorens)
|
||||||
|
Files: src/charset.c, src/eval.c, src/mark.c, src/proto/charset.pro,
|
||||||
|
src/proto/mark.pro, src/regexp.c, src/syntax.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.775/src/charset.c 2012-05-25 11:56:06.000000000 +0200
|
||||||
|
--- src/charset.c 2013-01-23 15:43:37.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 905,910 ****
|
||||||
|
--- 905,918 ----
|
||||||
|
vim_iswordc(c)
|
||||||
|
int c;
|
||||||
|
{
|
||||||
|
+ return vim_iswordc_buf(c, curbuf);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ int
|
||||||
|
+ vim_iswordc_buf(c, buf)
|
||||||
|
+ int c;
|
||||||
|
+ buf_T *buf;
|
||||||
|
+ {
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
if (c >= 0x100)
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 914,920 ****
|
||||||
|
return utf_class(c) >= 2;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
! return (c > 0 && c < 0x100 && GET_CHARTAB(curbuf, c) != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
--- 922,928 ----
|
||||||
|
return utf_class(c) >= 2;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
! return (c > 0 && c < 0x100 && GET_CHARTAB(buf, c) != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
***************
|
||||||
|
*** 933,939 ****
|
||||||
|
|
||||||
|
#if defined(FEAT_SYN_HL) || defined(PROTO)
|
||||||
|
int
|
||||||
|
! vim_iswordc_buf(p, buf)
|
||||||
|
char_u *p;
|
||||||
|
buf_T *buf;
|
||||||
|
{
|
||||||
|
--- 941,947 ----
|
||||||
|
|
||||||
|
#if defined(FEAT_SYN_HL) || defined(PROTO)
|
||||||
|
int
|
||||||
|
! vim_iswordp_buf(p, buf)
|
||||||
|
char_u *p;
|
||||||
|
buf_T *buf;
|
||||||
|
{
|
||||||
|
*** ../vim-7.3.775/src/eval.c 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/eval.c 2013-01-23 14:24:08.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 18884,18890 ****
|
||||||
|
#endif
|
||||||
|
if (name[0] == '\'') /* mark */
|
||||||
|
{
|
||||||
|
! pp = getmark_fnum(name[1], FALSE, fnum);
|
||||||
|
if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0)
|
||||||
|
return NULL;
|
||||||
|
return pp;
|
||||||
|
--- 18884,18890 ----
|
||||||
|
#endif
|
||||||
|
if (name[0] == '\'') /* mark */
|
||||||
|
{
|
||||||
|
! pp = getmark_buf_fnum(curbuf, name[1], FALSE, fnum);
|
||||||
|
if (pp == NULL || pp == (pos_T *)-1 || pp->lnum <= 0)
|
||||||
|
return NULL;
|
||||||
|
return pp;
|
||||||
|
*** ../vim-7.3.775/src/mark.c 2012-07-06 17:51:24.000000000 +0200
|
||||||
|
--- src/mark.c 2013-01-23 14:24:16.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 304,310 ****
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
! * Find mark "c".
|
||||||
|
* If "changefile" is TRUE it's allowed to edit another file for '0, 'A, etc.
|
||||||
|
* If "fnum" is not NULL store the fnum there for '0, 'A etc., don't edit
|
||||||
|
* another file.
|
||||||
|
--- 304,310 ----
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
! * Find mark "c" in buffer pointed to by "buf".
|
||||||
|
* If "changefile" is TRUE it's allowed to edit another file for '0, 'A, etc.
|
||||||
|
* If "fnum" is not NULL store the fnum there for '0, 'A etc., don't edit
|
||||||
|
* another file.
|
||||||
|
***************
|
||||||
|
*** 315,329 ****
|
||||||
|
* - -1 if mark is in other file and jumped there (only if changefile is TRUE)
|
||||||
|
*/
|
||||||
|
pos_T *
|
||||||
|
getmark(c, changefile)
|
||||||
|
int c;
|
||||||
|
int changefile;
|
||||||
|
{
|
||||||
|
! return getmark_fnum(c, changefile, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
pos_T *
|
||||||
|
! getmark_fnum(c, changefile, fnum)
|
||||||
|
int c;
|
||||||
|
int changefile;
|
||||||
|
int *fnum;
|
||||||
|
--- 315,339 ----
|
||||||
|
* - -1 if mark is in other file and jumped there (only if changefile is TRUE)
|
||||||
|
*/
|
||||||
|
pos_T *
|
||||||
|
+ getmark_buf(buf, c, changefile)
|
||||||
|
+ buf_T *buf;
|
||||||
|
+ int c;
|
||||||
|
+ int changefile;
|
||||||
|
+ {
|
||||||
|
+ return getmark_buf_fnum(buf, c, changefile, NULL);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ pos_T *
|
||||||
|
getmark(c, changefile)
|
||||||
|
int c;
|
||||||
|
int changefile;
|
||||||
|
{
|
||||||
|
! return getmark_buf_fnum(curbuf, c, changefile, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
pos_T *
|
||||||
|
! getmark_buf_fnum(buf, c, changefile, fnum)
|
||||||
|
! buf_T *buf;
|
||||||
|
int c;
|
||||||
|
int changefile;
|
||||||
|
int *fnum;
|
||||||
|
***************
|
||||||
|
*** 351,365 ****
|
||||||
|
posp = &pos_copy; /* w_pcmark may be changed soon */
|
||||||
|
}
|
||||||
|
else if (c == '"') /* to pos when leaving buffer */
|
||||||
|
! posp = &(curbuf->b_last_cursor);
|
||||||
|
else if (c == '^') /* to where Insert mode stopped */
|
||||||
|
! posp = &(curbuf->b_last_insert);
|
||||||
|
else if (c == '.') /* to where last change was made */
|
||||||
|
! posp = &(curbuf->b_last_change);
|
||||||
|
else if (c == '[') /* to start of previous operator */
|
||||||
|
! posp = &(curbuf->b_op_start);
|
||||||
|
else if (c == ']') /* to end of previous operator */
|
||||||
|
! posp = &(curbuf->b_op_end);
|
||||||
|
else if (c == '{' || c == '}') /* to previous/next paragraph */
|
||||||
|
{
|
||||||
|
pos_T pos;
|
||||||
|
--- 361,375 ----
|
||||||
|
posp = &pos_copy; /* w_pcmark may be changed soon */
|
||||||
|
}
|
||||||
|
else if (c == '"') /* to pos when leaving buffer */
|
||||||
|
! posp = &(buf->b_last_cursor);
|
||||||
|
else if (c == '^') /* to where Insert mode stopped */
|
||||||
|
! posp = &(buf->b_last_insert);
|
||||||
|
else if (c == '.') /* to where last change was made */
|
||||||
|
! posp = &(buf->b_last_change);
|
||||||
|
else if (c == '[') /* to start of previous operator */
|
||||||
|
! posp = &(buf->b_op_start);
|
||||||
|
else if (c == ']') /* to end of previous operator */
|
||||||
|
! posp = &(buf->b_op_end);
|
||||||
|
else if (c == '{' || c == '}') /* to previous/next paragraph */
|
||||||
|
{
|
||||||
|
pos_T pos;
|
||||||
|
***************
|
||||||
|
*** 395,402 ****
|
||||||
|
#ifdef FEAT_VISUAL
|
||||||
|
else if (c == '<' || c == '>') /* start/end of visual area */
|
||||||
|
{
|
||||||
|
! startp = &curbuf->b_visual.vi_start;
|
||||||
|
! endp = &curbuf->b_visual.vi_end;
|
||||||
|
if ((c == '<') == lt(*startp, *endp))
|
||||||
|
posp = startp;
|
||||||
|
else
|
||||||
|
--- 405,412 ----
|
||||||
|
#ifdef FEAT_VISUAL
|
||||||
|
else if (c == '<' || c == '>') /* start/end of visual area */
|
||||||
|
{
|
||||||
|
! startp = &buf->b_visual.vi_start;
|
||||||
|
! endp = &buf->b_visual.vi_end;
|
||||||
|
if ((c == '<') == lt(*startp, *endp))
|
||||||
|
posp = startp;
|
||||||
|
else
|
||||||
|
***************
|
||||||
|
*** 404,410 ****
|
||||||
|
/*
|
||||||
|
* For Visual line mode, set mark at begin or end of line
|
||||||
|
*/
|
||||||
|
! if (curbuf->b_visual.vi_mode == 'V')
|
||||||
|
{
|
||||||
|
pos_copy = *posp;
|
||||||
|
posp = &pos_copy;
|
||||||
|
--- 414,420 ----
|
||||||
|
/*
|
||||||
|
* For Visual line mode, set mark at begin or end of line
|
||||||
|
*/
|
||||||
|
! if (buf->b_visual.vi_mode == 'V')
|
||||||
|
{
|
||||||
|
pos_copy = *posp;
|
||||||
|
posp = &pos_copy;
|
||||||
|
***************
|
||||||
|
*** 420,426 ****
|
||||||
|
#endif
|
||||||
|
else if (ASCII_ISLOWER(c)) /* normal named mark */
|
||||||
|
{
|
||||||
|
! posp = &(curbuf->b_namedm[c - 'a']);
|
||||||
|
}
|
||||||
|
else if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c)) /* named file mark */
|
||||||
|
{
|
||||||
|
--- 430,436 ----
|
||||||
|
#endif
|
||||||
|
else if (ASCII_ISLOWER(c)) /* normal named mark */
|
||||||
|
{
|
||||||
|
! posp = &(buf->b_namedm[c - 'a']);
|
||||||
|
}
|
||||||
|
else if (ASCII_ISUPPER(c) || VIM_ISDIGIT(c)) /* named file mark */
|
||||||
|
{
|
||||||
|
***************
|
||||||
|
*** 435,441 ****
|
||||||
|
|
||||||
|
if (fnum != NULL)
|
||||||
|
*fnum = namedfm[c].fmark.fnum;
|
||||||
|
! else if (namedfm[c].fmark.fnum != curbuf->b_fnum)
|
||||||
|
{
|
||||||
|
/* mark is in another file */
|
||||||
|
posp = &pos_copy;
|
||||||
|
--- 445,451 ----
|
||||||
|
|
||||||
|
if (fnum != NULL)
|
||||||
|
*fnum = namedfm[c].fmark.fnum;
|
||||||
|
! else if (namedfm[c].fmark.fnum != buf->b_fnum)
|
||||||
|
{
|
||||||
|
/* mark is in another file */
|
||||||
|
posp = &pos_copy;
|
||||||
|
*** ../vim-7.3.775/src/proto/charset.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/charset.pro 2013-01-23 15:43:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 19,26 ****
|
||||||
|
int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len));
|
||||||
|
int vim_isIDc __ARGS((int c));
|
||||||
|
int vim_iswordc __ARGS((int c));
|
||||||
|
int vim_iswordp __ARGS((char_u *p));
|
||||||
|
! int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf));
|
||||||
|
int vim_isfilec __ARGS((int c));
|
||||||
|
int vim_isfilec_or_wc __ARGS((int c));
|
||||||
|
int vim_isprintc __ARGS((int c));
|
||||||
|
--- 19,27 ----
|
||||||
|
int win_linetabsize __ARGS((win_T *wp, char_u *p, colnr_T len));
|
||||||
|
int vim_isIDc __ARGS((int c));
|
||||||
|
int vim_iswordc __ARGS((int c));
|
||||||
|
+ int vim_iswordc_buf __ARGS((int c, buf_T *buf));
|
||||||
|
int vim_iswordp __ARGS((char_u *p));
|
||||||
|
! int vim_iswordp_buf __ARGS((char_u *p, buf_T *buf));
|
||||||
|
int vim_isfilec __ARGS((int c));
|
||||||
|
int vim_isfilec_or_wc __ARGS((int c));
|
||||||
|
int vim_isprintc __ARGS((int c));
|
||||||
|
*** ../vim-7.3.775/src/proto/mark.pro 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/proto/mark.pro 2013-01-23 14:24:23.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 5,12 ****
|
||||||
|
void checkpcmark __ARGS((void));
|
||||||
|
pos_T *movemark __ARGS((int count));
|
||||||
|
pos_T *movechangelist __ARGS((int count));
|
||||||
|
pos_T *getmark __ARGS((int c, int changefile));
|
||||||
|
! pos_T *getmark_fnum __ARGS((int c, int changefile, int *fnum));
|
||||||
|
pos_T *getnextmark __ARGS((pos_T *startpos, int dir, int begin_line));
|
||||||
|
void fmarks_check_names __ARGS((buf_T *buf));
|
||||||
|
int check_mark __ARGS((pos_T *pos));
|
||||||
|
--- 5,13 ----
|
||||||
|
void checkpcmark __ARGS((void));
|
||||||
|
pos_T *movemark __ARGS((int count));
|
||||||
|
pos_T *movechangelist __ARGS((int count));
|
||||||
|
+ pos_T *getmark_buf __ARGS((buf_T *buf, int c, int changefile));
|
||||||
|
pos_T *getmark __ARGS((int c, int changefile));
|
||||||
|
! pos_T *getmark_buf_fnum __ARGS((buf_T *buf, int c, int changefile, int *fnum));
|
||||||
|
pos_T *getnextmark __ARGS((pos_T *startpos, int dir, int begin_line));
|
||||||
|
void fmarks_check_names __ARGS((buf_T *buf));
|
||||||
|
int check_mark __ARGS((pos_T *pos));
|
||||||
|
*** ../vim-7.3.775/src/regexp.c 2011-07-20 17:58:14.000000000 +0200
|
||||||
|
--- src/regexp.c 2013-01-23 14:19:15.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3623,3629 ****
|
||||||
|
proftime_T *tm; /* timeout limit or NULL */
|
||||||
|
{
|
||||||
|
long r;
|
||||||
|
- buf_T *save_curbuf = curbuf;
|
||||||
|
|
||||||
|
reg_match = NULL;
|
||||||
|
reg_mmatch = rmp;
|
||||||
|
--- 3623,3628 ----
|
||||||
|
***************
|
||||||
|
*** 3638,3647 ****
|
||||||
|
#endif
|
||||||
|
ireg_maxcol = rmp->rmm_maxcol;
|
||||||
|
|
||||||
|
- /* Need to switch to buffer "buf" to make vim_iswordc() work. */
|
||||||
|
- curbuf = buf;
|
||||||
|
r = vim_regexec_both(NULL, col, tm);
|
||||||
|
- curbuf = save_curbuf;
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
--- 3637,3643 ----
|
||||||
|
***************
|
||||||
|
*** 4185,4191 ****
|
||||||
|
int cmp = OPERAND(scan)[1];
|
||||||
|
pos_T *pos;
|
||||||
|
|
||||||
|
! pos = getmark(mark, FALSE);
|
||||||
|
if (pos == NULL /* mark doesn't exist */
|
||||||
|
|| pos->lnum <= 0 /* mark isn't set (in curbuf) */
|
||||||
|
|| (pos->lnum == reglnum + reg_firstlnum
|
||||||
|
--- 4181,4187 ----
|
||||||
|
int cmp = OPERAND(scan)[1];
|
||||||
|
pos_T *pos;
|
||||||
|
|
||||||
|
! pos = getmark_buf(reg_buf, mark, FALSE);
|
||||||
|
if (pos == NULL /* mark doesn't exist */
|
||||||
|
|| pos->lnum <= 0 /* mark isn't set (in curbuf) */
|
||||||
|
|| (pos->lnum == reglnum + reg_firstlnum
|
||||||
|
***************
|
||||||
|
*** 4315,4322 ****
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
! if (!vim_iswordc(c)
|
||||||
|
! || (reginput > regline && vim_iswordc(reginput[-1])))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
--- 4311,4318 ----
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
! if (!vim_iswordc_buf(c, reg_buf)
|
||||||
|
! || (reginput > regline && vim_iswordc_buf(reginput[-1], reg_buf)))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
***************
|
||||||
|
*** 4339,4346 ****
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
! if (!vim_iswordc(reginput[-1])
|
||||||
|
! || (reginput[0] != NUL && vim_iswordc(c)))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
}
|
||||||
|
break; /* Matched with EOW */
|
||||||
|
--- 4335,4342 ----
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
! if (!vim_iswordc_buf(reginput[-1], reg_buf)
|
||||||
|
! || (reginput[0] != NUL && vim_iswordc_buf(c, reg_buf)))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
}
|
||||||
|
break; /* Matched with EOW */
|
||||||
|
*** ../vim-7.3.775/src/syntax.c 2012-10-21 21:25:17.000000000 +0200
|
||||||
|
--- src/syntax.c 2013-01-23 14:19:15.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1954,1962 ****
|
||||||
|
if (do_keywords)
|
||||||
|
{
|
||||||
|
line = syn_getcurline();
|
||||||
|
! if (vim_iswordc_buf(line + current_col, syn_buf)
|
||||||
|
&& (current_col == 0
|
||||||
|
! || !vim_iswordc_buf(line + current_col - 1
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
- (has_mbyte
|
||||||
|
? (*mb_head_off)(line, line + current_col - 1)
|
||||||
|
--- 1954,1962 ----
|
||||||
|
if (do_keywords)
|
||||||
|
{
|
||||||
|
line = syn_getcurline();
|
||||||
|
! if (vim_iswordp_buf(line + current_col, syn_buf)
|
||||||
|
&& (current_col == 0
|
||||||
|
! || !vim_iswordp_buf(line + current_col - 1
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
- (has_mbyte
|
||||||
|
? (*mb_head_off)(line, line + current_col - 1)
|
||||||
|
***************
|
||||||
|
*** 3280,3286 ****
|
||||||
|
#endif
|
||||||
|
++kwlen;
|
||||||
|
}
|
||||||
|
! while (vim_iswordc_buf(kwp + kwlen, syn_buf));
|
||||||
|
|
||||||
|
if (kwlen > MAXKEYWLEN)
|
||||||
|
return 0;
|
||||||
|
--- 3280,3286 ----
|
||||||
|
#endif
|
||||||
|
++kwlen;
|
||||||
|
}
|
||||||
|
! while (vim_iswordp_buf(kwp + kwlen, syn_buf));
|
||||||
|
|
||||||
|
if (kwlen > MAXKEYWLEN)
|
||||||
|
return 0;
|
||||||
|
*** ../vim-7.3.775/src/version.c 2013-01-23 13:55:16.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 14:19:44.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 776,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Q: How does a UNIX Guru do Sex ?
|
||||||
|
A: unzip;strip;touch;finger;mount;fsck;more;yes;umount;sleep
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
59
7.3.777
Normal file
59
7.3.777
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.777
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.777
|
||||||
|
Problem: When building with Gnome locale gets reset.
|
||||||
|
Solution: Set locale after gnome_program_init(). (Christian Brabandt)
|
||||||
|
Files: src/gui_gtk_x11.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.776/src/gui_gtk_x11.c 2012-05-18 17:03:14.000000000 +0200
|
||||||
|
--- src/gui_gtk_x11.c 2013-01-23 15:58:14.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3130,3137 ****
|
||||||
|
--- 3130,3145 ----
|
||||||
|
* exits on failure, but that's a non-issue because we already called
|
||||||
|
* gtk_init_check() in gui_mch_init_check(). */
|
||||||
|
if (using_gnome)
|
||||||
|
+ {
|
||||||
|
gnome_program_init(VIMPACKAGE, VIM_VERSION_SHORT,
|
||||||
|
LIBGNOMEUI_MODULE, gui_argc, gui_argv, NULL);
|
||||||
|
+ # if defined(FEAT_FLOAT) && defined(LC_NUMERIC)
|
||||||
|
+ /* Make sure strtod() uses a decimal point, not a comma. Gnome init
|
||||||
|
+ * may change it. */
|
||||||
|
+ if (setlocale(LC_NUMERIC, NULL) != (char *) "C")
|
||||||
|
+ setlocale(LC_NUMERIC, "C");
|
||||||
|
+ # endif
|
||||||
|
+ }
|
||||||
|
#endif
|
||||||
|
vim_free(gui_argv);
|
||||||
|
gui_argv = NULL;
|
||||||
|
*** ../vim-7.3.776/src/version.c 2013-01-23 15:53:08.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 15:56:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 777,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
[clop clop]
|
||||||
|
GUARD #1: Halt! Who goes there?
|
||||||
|
ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of
|
||||||
|
Camelot. King of the Britons, defeator of the Saxons, sovereign of
|
||||||
|
all England!
|
||||||
|
GUARD #1: Pull the other one!
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
53
7.3.778
Normal file
53
7.3.778
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.778
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.778
|
||||||
|
Problem: Compiler error for adding up two pointers. (Titov Anatoly)
|
||||||
|
Solution: Add a type cast. (Ken Takata)
|
||||||
|
Files: src/mbyte.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.777/src/mbyte.c 2013-01-19 14:01:57.000000000 +0100
|
||||||
|
--- src/mbyte.c 2013-01-23 16:18:02.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4325,4331 ****
|
||||||
|
{
|
||||||
|
if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
|
||||||
|
continue;
|
||||||
|
! pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage + pINT->u1.AddressOfData);
|
||||||
|
if (strcmp(pImpName->Name, funcname) == 0)
|
||||||
|
return (void *)pIAT->u1.Function;
|
||||||
|
}
|
||||||
|
--- 4325,4332 ----
|
||||||
|
{
|
||||||
|
if (IMAGE_SNAP_BY_ORDINAL(pINT->u1.Ordinal))
|
||||||
|
continue;
|
||||||
|
! pImpName = (PIMAGE_IMPORT_BY_NAME)(pImage
|
||||||
|
! + (UINT_PTR)(pINT->u1.AddressOfData));
|
||||||
|
if (strcmp(pImpName->Name, funcname) == 0)
|
||||||
|
return (void *)pIAT->u1.Function;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.777/src/version.c 2013-01-23 16:00:05.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 16:18:40.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 778,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
'I generally avoid temptation unless I can't resist it."
|
||||||
|
-- Mae West
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
86
7.3.779
Normal file
86
7.3.779
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.779
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.779
|
||||||
|
Problem: Backwards search lands in wrong place when started on a multibyte
|
||||||
|
character.
|
||||||
|
Solution: Do not set extra_col for a backwards search. (Sung Pae)
|
||||||
|
Files: src/search.c, src/testdir/test44.in, src/testdir/test44.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.778/src/search.c 2013-01-17 17:01:57.000000000 +0100
|
||||||
|
--- src/search.c 2013-01-23 16:27:35.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 572,578 ****
|
||||||
|
extra_col = 0;
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
/* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
|
||||||
|
! else if (has_mbyte && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
|
||||||
|
&& pos->col < MAXCOL - 2)
|
||||||
|
{
|
||||||
|
ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
|
||||||
|
--- 572,579 ----
|
||||||
|
extra_col = 0;
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
/* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
|
||||||
|
! else if (dir != BACKWARD && has_mbyte
|
||||||
|
! && pos->lnum >= 1 && pos->lnum <= buf->b_ml.ml_line_count
|
||||||
|
&& pos->col < MAXCOL - 2)
|
||||||
|
{
|
||||||
|
ptr = ml_get_buf(buf, pos->lnum, FALSE) + pos->col;
|
||||||
|
*** ../vim-7.3.778/src/testdir/test44.in 2011-07-20 17:58:14.000000000 +0200
|
||||||
|
--- src/testdir/test44.in 2013-01-23 16:22:38.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 29,34 ****
|
||||||
|
--- 29,37 ----
|
||||||
|
x/\%d21879b
|
||||||
|
x/ [[=A=]]* [[=B=]]* [[=C=]]* [[=D=]]* [[=E=]]* [[=F=]]* [[=G=]]* [[=H=]]* [[=I=]]* [[=J=]]* [[=K=]]* [[=L=]]* [[=M=]]* [[=N=]]* [[=O=]]* [[=P=]]* [[=Q=]]* [[=R=]]* [[=S=]]* [[=T=]]* [[=U=]]* [[=V=]]* [[=W=]]* [[=X=]]* [[=Y=]]* [[=Z=]]*/e
|
||||||
|
x/ [[=a=]]* [[=b=]]* [[=c=]]* [[=d=]]* [[=e=]]* [[=f=]]* [[=g=]]* [[=h=]]* [[=i=]]* [[=j=]]* [[=k=]]* [[=l=]]* [[=m=]]* [[=n=]]* [[=o=]]* [[=p=]]* [[=q=]]* [[=r=]]* [[=s=]]* [[=t=]]* [[=u=]]* [[=v=]]* [[=w=]]* [[=x=]]* [[=y=]]* [[=z=]]*/e
|
||||||
|
+ x:" Test backwards search from a multi-byte char
|
||||||
|
+ /x
|
||||||
|
+ x?.
|
||||||
|
x:?^1?,$w! test.out
|
||||||
|
:e! test.out
|
||||||
|
G:put =matchstr(\"אבגד\", \".\", 0, 2) " ב
|
||||||
|
***************
|
||||||
|
*** 57,59 ****
|
||||||
|
--- 60,63 ----
|
||||||
|
g a啷bb
|
||||||
|
h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐẔ
|
||||||
|
i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑẕ
|
||||||
|
+ j 0123❤x
|
||||||
|
*** ../vim-7.3.778/src/testdir/test44.ok 2011-07-20 17:58:14.000000000 +0200
|
||||||
|
--- src/testdir/test44.ok 2013-01-23 16:22:38.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 16,21 ****
|
||||||
|
--- 16,22 ----
|
||||||
|
g abb
|
||||||
|
h AÀÁÂÃÄÅĀĂĄǍǞǠẢ BḂḆ CÇĆĈĊČ DĎĐḊḎḐ EÈÉÊËĒĔĖĘĚẺẼ FḞ GĜĞĠĢǤǦǴḠ HĤĦḢḦḨ IÌÍÎÏĨĪĬĮİǏỈ JĴ KĶǨḰḴ LĹĻĽĿŁḺ MḾṀ NÑŃŅŇṄṈ OÒÓÔÕÖØŌŎŐƠǑǪǬỎ PṔṖ Q RŔŖŘṘṞ SŚŜŞŠṠ TŢŤŦṪṮ UÙÚÛÜŨŪŬŮŰŲƯǓỦ VṼ WŴẀẂẄẆ XẊẌ YÝŶŸẎỲỶỸ ZŹŻŽƵẐ
|
||||||
|
i aàáâãäåāăąǎǟǡả bḃḇ cçćĉċč dďđḋḏḑ eèéêëēĕėęěẻẽ fḟ gĝğġģǥǧǵḡ hĥħḣḧḩẖ iìíîïĩīĭįǐỉ jĵǰ kķǩḱḵ lĺļľŀłḻ mḿṁ nñńņňʼnṅṉ oòóôõöøōŏőơǒǫǭỏ pṕṗ q rŕŗřṙṟ sśŝşšṡ tţťŧṫṯẗ uùúûüũūŭůűųưǔủ vṽ wŵẁẃẅẇẘ xẋẍ yýÿŷẏẙỳỷỹ zźżžƶẑ
|
||||||
|
+ j 012❤
|
||||||
|
ב
|
||||||
|
בג
|
||||||
|
א
|
||||||
|
*** ../vim-7.3.778/src/version.c 2013-01-23 16:19:17.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 16:39:23.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 779,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Veni, Vidi, Video -- I came, I saw, I taped what I saw.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
111
7.3.780
Normal file
111
7.3.780
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
diff -up vim73/runtime/doc/eval.txt.780 vim73/runtime/doc/eval.txt
|
||||||
|
--- vim73/runtime/doc/eval.txt.780 2013-01-28 13:41:04.000000000 +0100
|
||||||
|
+++ runtime/doc/eval.txt 2013-01-28 13:44:58.000000000 +0100
|
||||||
|
@@ -1705,7 +1705,7 @@ call( {func}, {arglist} [, {dict}])
|
||||||
|
any call {func} with arguments {arglist}
|
||||||
|
ceil( {expr}) Float round {expr} up
|
||||||
|
changenr() Number current change number
|
||||||
|
-char2nr( {expr}) Number ASCII value of first char in {expr}
|
||||||
|
+char2nr( {expr}[, {utf8}]) Number ASCII/UTF8 value of first char in {expr}
|
||||||
|
cindent( {lnum}) Number C indent for line {lnum}
|
||||||
|
clearmatches() none clear all matches
|
||||||
|
col( {expr}) Number column nr of cursor or mark
|
||||||
|
@@ -1862,7 +1862,7 @@ mkdir( {name} [, {path} [, {prot}]])
|
||||||
|
mode( [expr]) String current editing mode
|
||||||
|
mzeval( {expr}) any evaluate |MzScheme| expression
|
||||||
|
nextnonblank( {lnum}) Number line nr of non-blank line >= {lnum}
|
||||||
|
-nr2char( {expr}) String single char with ASCII value {expr}
|
||||||
|
+nr2char( {expr}[, {utf8}]) String single char with ASCII/UTF8 value {expr}
|
||||||
|
or( {expr}, {expr}) Number bitwise OR
|
||||||
|
pathshorten( {expr}) String shorten directory names in a path
|
||||||
|
pow( {x}, {y}) Float {x} to the power of {y}
|
||||||
|
@@ -2282,13 +2282,17 @@ changenr() *changenr()*
|
||||||
|
redo it is the number of the redone change. After undo it is
|
||||||
|
one less than the number of the undone change.
|
||||||
|
|
||||||
|
-char2nr({expr}) *char2nr()*
|
||||||
|
+char2nr({expr}[, {utf8}]) **char2nr()*
|
||||||
|
Return number value of the first char in {expr}. Examples: >
|
||||||
|
char2nr(" ") returns 32
|
||||||
|
char2nr("ABC") returns 65
|
||||||
|
-< The current 'encoding' is used. Example for "utf-8": >
|
||||||
|
+< When {utf8} is omitted or zero, the current 'encoding' is
|
||||||
|
+used.
|
||||||
|
+ Example for "utf-8": >
|
||||||
|
char2nr("á") returns 225
|
||||||
|
char2nr("á"[0]) returns 195
|
||||||
|
+ With {utf8} set to 1, always treat as utf-8 characters.
|
||||||
|
+ A combining character is a separate character.
|
||||||
|
< |nr2char()| does the opposite.
|
||||||
|
|
||||||
|
cindent({lnum}) *cindent()*
|
||||||
|
diff -up vim73/src/eval.c.780 vim73/src/eval.c
|
||||||
|
--- vim73/src/eval.c.780 2013-01-28 13:41:04.000000000 +0100
|
||||||
|
+++ src/eval.c 2013-01-28 13:41:04.000000000 +0100
|
||||||
|
@@ -7854,7 +7854,7 @@ static struct fst
|
||||||
|
{"ceil", 1, 1, f_ceil},
|
||||||
|
#endif
|
||||||
|
{"changenr", 0, 0, f_changenr},
|
||||||
|
- {"char2nr", 1, 1, f_char2nr},
|
||||||
|
+ {"char2nr", 1, 2, f_char2nr},
|
||||||
|
{"cindent", 1, 1, f_cindent},
|
||||||
|
{"clearmatches", 0, 0, f_clearmatches},
|
||||||
|
{"col", 1, 1, f_col},
|
||||||
|
@@ -8003,7 +8003,7 @@ static struct fst
|
||||||
|
{"mzeval", 1, 1, f_mzeval},
|
||||||
|
#endif
|
||||||
|
{"nextnonblank", 1, 1, f_nextnonblank},
|
||||||
|
- {"nr2char", 1, 1, f_nr2char},
|
||||||
|
+ {"nr2char", 1, 2, f_nr2char},
|
||||||
|
{"or", 2, 2, f_or},
|
||||||
|
{"pathshorten", 1, 1, f_pathshorten},
|
||||||
|
#ifdef FEAT_FLOAT
|
||||||
|
@@ -9303,7 +9303,17 @@ f_char2nr(argvars, rettv)
|
||||||
|
{
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
if (has_mbyte)
|
||||||
|
- rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0]));
|
||||||
|
+ {
|
||||||
|
+ int utf8 = 0;
|
||||||
|
+
|
||||||
|
+ if (argvars[1].v_type != VAR_UNKNOWN)
|
||||||
|
+ utf8 = get_tv_number_chk(&argvars[1], NULL);
|
||||||
|
+
|
||||||
|
+ if (utf8)
|
||||||
|
+ rettv->vval.v_number = (*utf_ptr2char)(get_tv_string(&argvars[0]));
|
||||||
|
+ else
|
||||||
|
+ rettv->vval.v_number = (*mb_ptr2char)(get_tv_string(&argvars[0]));
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
rettv->vval.v_number = get_tv_string(&argvars[0])[0];
|
||||||
|
@@ -14360,7 +14370,16 @@ f_nr2char(argvars, rettv)
|
||||||
|
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
if (has_mbyte)
|
||||||
|
- buf[(*mb_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
|
||||||
|
+ {
|
||||||
|
+ int utf8 = 0;
|
||||||
|
+
|
||||||
|
+ if (argvars[1].v_type != VAR_UNKNOWN)
|
||||||
|
+ utf8 = get_tv_number_chk(&argvars[1], NULL);
|
||||||
|
+ if (utf8)
|
||||||
|
+ buf[(*utf_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
|
||||||
|
+ else
|
||||||
|
+ buf[(*mb_char2bytes)((int)get_tv_number(&argvars[0]), buf)] = NUL;
|
||||||
|
+ }
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
diff -up vim73/src/version.c.780 vim73/src/version.c
|
||||||
|
--- vim73/src/version.c.780 2013-01-28 13:41:04.000000000 +0100
|
||||||
|
+++ src/version.c 2013-01-28 13:41:04.000000000 +0100
|
||||||
|
@@ -726,6 +726,8 @@ static char *(features[]) =
|
||||||
|
static int included_patches[] =
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
+ 780,
|
||||||
|
+/**/
|
||||||
|
779,
|
||||||
|
/**/
|
||||||
|
778,
|
||||||
185
7.3.781
Normal file
185
7.3.781
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.781
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.781
|
||||||
|
Problem: Drawing with 'guifontwide' can be slow.
|
||||||
|
Solution: Draw multiple characters at a time. (Taro Muraoka)
|
||||||
|
Files: src/gui.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.780/src/gui.c 2012-11-20 12:03:02.000000000 +0100
|
||||||
|
--- src/gui.c 2013-01-23 17:28:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2380,2386 ****
|
||||||
|
int cl; /* byte length of current char */
|
||||||
|
int comping; /* current char is composing */
|
||||||
|
int scol = col; /* screen column */
|
||||||
|
! int dowide; /* use 'guifontwide' */
|
||||||
|
|
||||||
|
/* Break the string at a composing character, it has to be drawn on
|
||||||
|
* top of the previous character. */
|
||||||
|
--- 2380,2388 ----
|
||||||
|
int cl; /* byte length of current char */
|
||||||
|
int comping; /* current char is composing */
|
||||||
|
int scol = col; /* screen column */
|
||||||
|
! int curr_wide; /* use 'guifontwide' */
|
||||||
|
! int prev_wide = FALSE;
|
||||||
|
! int wide_changed;
|
||||||
|
|
||||||
|
/* Break the string at a composing character, it has to be drawn on
|
||||||
|
* top of the previous character. */
|
||||||
|
***************
|
||||||
|
*** 2395,2403 ****
|
||||||
|
&& fontset == NOFONTSET
|
||||||
|
# endif
|
||||||
|
&& gui.wide_font != NOFONT)
|
||||||
|
! dowide = TRUE;
|
||||||
|
else
|
||||||
|
! dowide = FALSE;
|
||||||
|
comping = utf_iscomposing(c);
|
||||||
|
if (!comping) /* count cells from non-composing chars */
|
||||||
|
cells += cn;
|
||||||
|
--- 2397,2405 ----
|
||||||
|
&& fontset == NOFONTSET
|
||||||
|
# endif
|
||||||
|
&& gui.wide_font != NOFONT)
|
||||||
|
! curr_wide = TRUE;
|
||||||
|
else
|
||||||
|
! curr_wide = FALSE;
|
||||||
|
comping = utf_iscomposing(c);
|
||||||
|
if (!comping) /* count cells from non-composing chars */
|
||||||
|
cells += cn;
|
||||||
|
***************
|
||||||
|
*** 2405,2413 ****
|
||||||
|
if (cl == 0) /* hit end of string */
|
||||||
|
len = i + cl; /* len must be wrong "cannot happen" */
|
||||||
|
|
||||||
|
! /* print the string so far if it's the last character or there is
|
||||||
|
* a composing character. */
|
||||||
|
! if (i + cl >= len || (comping && i > start) || dowide
|
||||||
|
# if defined(FEAT_GUI_X11)
|
||||||
|
|| (cn > 1
|
||||||
|
# ifdef FEAT_XFONTSET
|
||||||
|
--- 2407,2417 ----
|
||||||
|
if (cl == 0) /* hit end of string */
|
||||||
|
len = i + cl; /* len must be wrong "cannot happen" */
|
||||||
|
|
||||||
|
! wide_changed = curr_wide != prev_wide;
|
||||||
|
!
|
||||||
|
! /* Print the string so far if it's the last character or there is
|
||||||
|
* a composing character. */
|
||||||
|
! if (i + cl >= len || (comping && i > start) || wide_changed
|
||||||
|
# if defined(FEAT_GUI_X11)
|
||||||
|
|| (cn > 1
|
||||||
|
# ifdef FEAT_XFONTSET
|
||||||
|
***************
|
||||||
|
*** 2419,2443 ****
|
||||||
|
# endif
|
||||||
|
)
|
||||||
|
{
|
||||||
|
! if (comping || dowide)
|
||||||
|
thislen = i - start;
|
||||||
|
else
|
||||||
|
thislen = i - start + cl;
|
||||||
|
if (thislen > 0)
|
||||||
|
{
|
||||||
|
gui_mch_draw_string(gui.row, scol, s + start, thislen,
|
||||||
|
draw_flags);
|
||||||
|
start += thislen;
|
||||||
|
}
|
||||||
|
scol += cells;
|
||||||
|
cells = 0;
|
||||||
|
! if (dowide)
|
||||||
|
{
|
||||||
|
! gui_mch_set_font(gui.wide_font);
|
||||||
|
! gui_mch_draw_string(gui.row, scol - cn,
|
||||||
|
! s + start, cl, draw_flags);
|
||||||
|
! gui_mch_set_font(font);
|
||||||
|
! start += cl;
|
||||||
|
}
|
||||||
|
|
||||||
|
# if defined(FEAT_GUI_X11)
|
||||||
|
--- 2423,2450 ----
|
||||||
|
# endif
|
||||||
|
)
|
||||||
|
{
|
||||||
|
! if (comping || wide_changed)
|
||||||
|
thislen = i - start;
|
||||||
|
else
|
||||||
|
thislen = i - start + cl;
|
||||||
|
if (thislen > 0)
|
||||||
|
{
|
||||||
|
+ if (prev_wide)
|
||||||
|
+ gui_mch_set_font(gui.wide_font);
|
||||||
|
gui_mch_draw_string(gui.row, scol, s + start, thislen,
|
||||||
|
draw_flags);
|
||||||
|
+ if (prev_wide)
|
||||||
|
+ gui_mch_set_font(font);
|
||||||
|
start += thislen;
|
||||||
|
}
|
||||||
|
scol += cells;
|
||||||
|
cells = 0;
|
||||||
|
! /* Adjust to not draw a character which width is changed
|
||||||
|
! * against with last one. */
|
||||||
|
! if (wide_changed && !comping)
|
||||||
|
{
|
||||||
|
! scol -= cn;
|
||||||
|
! cl = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
# if defined(FEAT_GUI_X11)
|
||||||
|
***************
|
||||||
|
*** 2447,2453 ****
|
||||||
|
# ifdef FEAT_XFONTSET
|
||||||
|
&& fontset == NOFONTSET
|
||||||
|
# endif
|
||||||
|
! && !dowide)
|
||||||
|
gui_mch_draw_string(gui.row, scol - 1, (char_u *)" ",
|
||||||
|
1, draw_flags);
|
||||||
|
# endif
|
||||||
|
--- 2454,2460 ----
|
||||||
|
# ifdef FEAT_XFONTSET
|
||||||
|
&& fontset == NOFONTSET
|
||||||
|
# endif
|
||||||
|
! && !wide_changed)
|
||||||
|
gui_mch_draw_string(gui.row, scol - 1, (char_u *)" ",
|
||||||
|
1, draw_flags);
|
||||||
|
# endif
|
||||||
|
***************
|
||||||
|
*** 2465,2470 ****
|
||||||
|
--- 2472,2478 ----
|
||||||
|
# endif
|
||||||
|
start = i + cl;
|
||||||
|
}
|
||||||
|
+ prev_wide = curr_wide;
|
||||||
|
}
|
||||||
|
/* The stuff below assumes "len" is the length in screen columns. */
|
||||||
|
len = scol - col;
|
||||||
|
*** ../vim-7.3.780/src/version.c 2013-01-23 17:15:25.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 17:28:17.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 781,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
GUARD #1: Where'd you get the coconut?
|
||||||
|
ARTHUR: We found them.
|
||||||
|
GUARD #1: Found them? In Mercea? The coconut's tropical!
|
||||||
|
ARTHUR: What do you mean?
|
||||||
|
GUARD #1: Well, this is a temperate zone.
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
171
7.3.782
Normal file
171
7.3.782
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.782
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.782
|
||||||
|
Problem: Windows: IME composition may use a wrong font.
|
||||||
|
Solution: Use 'guifontwide' for IME when it is set. (Taro Muraoka)
|
||||||
|
Files: runtime/doc/options.txt, src/gui.c, src/gui_w48.c,
|
||||||
|
src/proto/gui_w16.pro, src/proto/gui_w32.pro
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.781/runtime/doc/options.txt 2012-08-15 16:20:59.000000000 +0200
|
||||||
|
--- runtime/doc/options.txt 2013-01-23 18:24:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3518,3523 ****
|
||||||
|
--- 3560,3569 ----
|
||||||
|
to set 'guifontwide' at all unless you want to override the choice
|
||||||
|
made by Pango/Xft.
|
||||||
|
|
||||||
|
+ Windows +multibyte only: *guifontwide_win_mbyte*
|
||||||
|
+
|
||||||
|
+ If set and vaild, 'guifontwide' is used for IME instead of 'guifont'.
|
||||||
|
+
|
||||||
|
*'guiheadroom'* *'ghr'*
|
||||||
|
'guiheadroom' 'ghr' number (default 50)
|
||||||
|
global
|
||||||
|
*** ../vim-7.3.781/src/gui.c 2013-01-23 17:43:52.000000000 +0100
|
||||||
|
--- src/gui.c 2013-01-23 18:24:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1002,1007 ****
|
||||||
|
--- 1002,1010 ----
|
||||||
|
else
|
||||||
|
#endif
|
||||||
|
gui.wide_font = font;
|
||||||
|
+ #ifdef FEAT_GUI_MSWIN
|
||||||
|
+ gui_mch_wide_font_changed();
|
||||||
|
+ #endif
|
||||||
|
return OK;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
*** ../vim-7.3.781/src/gui_w48.c 2012-12-16 12:50:33.000000000 +0100
|
||||||
|
--- src/gui_w48.c 2013-01-23 18:32:45.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 323,332 ****
|
||||||
|
--- 323,337 ----
|
||||||
|
|
||||||
|
/*
|
||||||
|
* For control IME.
|
||||||
|
+ *
|
||||||
|
+ * These LOGFONT used for IME.
|
||||||
|
*/
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
# ifdef USE_IM_CONTROL
|
||||||
|
+ /* holds LOGFONT for 'guifontwide' if available, otherwise 'guifont' */
|
||||||
|
static LOGFONT norm_logfont;
|
||||||
|
+ /* holds LOGFONT for 'guifont' always. */
|
||||||
|
+ static LOGFONT sub_logfont;
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 3090,3095 ****
|
||||||
|
--- 3095,3133 ----
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
+
|
||||||
|
+ #ifdef FEAT_MBYTE_IME
|
||||||
|
+ /*
|
||||||
|
+ * Set correct LOGFONT to IME. Use 'guifontwide' if available, otherwise use
|
||||||
|
+ * 'guifont'
|
||||||
|
+ */
|
||||||
|
+ static void
|
||||||
|
+ update_im_font()
|
||||||
|
+ {
|
||||||
|
+ LOGFONT lf_wide;
|
||||||
|
+
|
||||||
|
+ if (p_guifontwide != NULL && *p_guifontwide != NUL
|
||||||
|
+ && get_logfont(&lf_wide, p_guifontwide, NULL, TRUE) == OK)
|
||||||
|
+ norm_logfont = lf_wide;
|
||||||
|
+ else
|
||||||
|
+ norm_logfont = sub_logfont;
|
||||||
|
+ im_set_font(&norm_logfont);
|
||||||
|
+ }
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
+ #ifdef FEAT_MBYTE
|
||||||
|
+ /*
|
||||||
|
+ * Handler of gui.wide_font (p_guifontwide) changed notification.
|
||||||
|
+ */
|
||||||
|
+ void
|
||||||
|
+ gui_mch_wide_font_changed()
|
||||||
|
+ {
|
||||||
|
+ # ifdef FEAT_MBYTE_IME
|
||||||
|
+ update_im_font();
|
||||||
|
+ # endif
|
||||||
|
+ }
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
/*
|
||||||
|
* Initialise vim to use the font with the given name.
|
||||||
|
* Return FAIL if the font could not be loaded, OK otherwise.
|
||||||
|
***************
|
||||||
|
*** 3112,3120 ****
|
||||||
|
font_name = lf.lfFaceName;
|
||||||
|
#if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)
|
||||||
|
norm_logfont = lf;
|
||||||
|
#endif
|
||||||
|
#ifdef FEAT_MBYTE_IME
|
||||||
|
! im_set_font(&lf);
|
||||||
|
#endif
|
||||||
|
gui_mch_free_font(gui.norm_font);
|
||||||
|
gui.norm_font = font;
|
||||||
|
--- 3150,3159 ----
|
||||||
|
font_name = lf.lfFaceName;
|
||||||
|
#if defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME)
|
||||||
|
norm_logfont = lf;
|
||||||
|
+ sub_logfont = lf;
|
||||||
|
#endif
|
||||||
|
#ifdef FEAT_MBYTE_IME
|
||||||
|
! update_im_font();
|
||||||
|
#endif
|
||||||
|
gui_mch_free_font(gui.norm_font);
|
||||||
|
gui.norm_font = font;
|
||||||
|
*** ../vim-7.3.781/src/proto/gui_w16.pro 2011-01-17 20:08:03.000000000 +0100
|
||||||
|
--- src/proto/gui_w16.pro 2013-01-23 18:24:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 50,55 ****
|
||||||
|
--- 50,56 ----
|
||||||
|
void gui_mch_insert_lines __ARGS((int row, int num_lines));
|
||||||
|
void gui_mch_exit __ARGS((int rc));
|
||||||
|
int gui_mch_init_font __ARGS((char_u *font_name, int fontset));
|
||||||
|
+ void gui_mch_wide_font_changed __ARGS((void));
|
||||||
|
int gui_mch_maximized __ARGS((void));
|
||||||
|
void gui_mch_newfont __ARGS((void));
|
||||||
|
void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
|
||||||
|
*** ../vim-7.3.781/src/proto/gui_w32.pro 2011-01-17 20:08:03.000000000 +0100
|
||||||
|
--- src/proto/gui_w32.pro 2013-01-23 18:24:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 50,55 ****
|
||||||
|
--- 50,56 ----
|
||||||
|
void gui_mch_insert_lines __ARGS((int row, int num_lines));
|
||||||
|
void gui_mch_exit __ARGS((int rc));
|
||||||
|
int gui_mch_init_font __ARGS((char_u *font_name, int fontset));
|
||||||
|
+ void gui_mch_wide_font_changed __ARGS((void));
|
||||||
|
int gui_mch_maximized __ARGS((void));
|
||||||
|
void gui_mch_newfont __ARGS((void));
|
||||||
|
void gui_mch_settitle __ARGS((char_u *title, char_u *icon));
|
||||||
|
*** ../vim-7.3.781/src/version.c 2013-01-23 17:43:52.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-23 18:25:33.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 782,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
"A mouse can be just as dangerous as a bullet or a bomb."
|
||||||
|
(US Representative Lamar Smith, R-Texas)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
44
7.3.783
Normal file
44
7.3.783
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.783
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.783
|
||||||
|
Problem: Crash when mark is not set. (Dominique Pelle)
|
||||||
|
Solution: Check for NULL.
|
||||||
|
Files: src/normal.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.782/src/normal.c 2013-01-17 13:24:00.000000000 +0100
|
||||||
|
--- src/normal.c 2013-01-24 20:57:53.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7552,7557 ****
|
||||||
|
--- 7552,7558 ----
|
||||||
|
#endif
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
if (cap->oap->op_type == OP_NOP
|
||||||
|
+ && pos != NULL
|
||||||
|
&& (pos == (pos_T *)-1 || !equalpos(old_cursor, *pos))
|
||||||
|
&& (fdo_flags & FDO_MARK)
|
||||||
|
&& old_KeyTyped)
|
||||||
|
*** ../vim-7.3.782/src/version.c 2013-01-23 18:37:31.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-24 20:58:36.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 783,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Shit makes the flowers grow and that's beautiful
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
59
7.3.784
Normal file
59
7.3.784
Normal file
@ -0,0 +1,59 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.784
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.784 (after 7.3.781)
|
||||||
|
Problem: Error when 'guifontwide' has a comma.
|
||||||
|
Solution: Use gui.wide_font. (Taro Muraoka)
|
||||||
|
Files: src/gui_w48.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.783/src/gui_w48.c 2013-01-23 18:37:31.000000000 +0100
|
||||||
|
--- src/gui_w48.c 2013-01-25 19:26:23.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3107,3113 ****
|
||||||
|
LOGFONT lf_wide;
|
||||||
|
|
||||||
|
if (p_guifontwide != NULL && *p_guifontwide != NUL
|
||||||
|
! && get_logfont(&lf_wide, p_guifontwide, NULL, TRUE) == OK)
|
||||||
|
norm_logfont = lf_wide;
|
||||||
|
else
|
||||||
|
norm_logfont = sub_logfont;
|
||||||
|
--- 3107,3114 ----
|
||||||
|
LOGFONT lf_wide;
|
||||||
|
|
||||||
|
if (p_guifontwide != NULL && *p_guifontwide != NUL
|
||||||
|
! && gui.wide_font != NOFONT
|
||||||
|
! && GetObject((HFONT)gui.wide_font, sizeof(lf_wide), &lf_wide))
|
||||||
|
norm_logfont = lf_wide;
|
||||||
|
else
|
||||||
|
norm_logfont = sub_logfont;
|
||||||
|
*** ../vim-7.3.783/src/version.c 2013-01-24 21:00:15.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-25 19:27:52.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 784,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
CUSTOMER: You're not fooling anyone y'know. Look, isn't there something
|
||||||
|
you can do?
|
||||||
|
DEAD PERSON: I feel happy... I feel happy.
|
||||||
|
[whop]
|
||||||
|
CUSTOMER: Ah, thanks very much.
|
||||||
|
MORTICIAN: Not at all. See you on Thursday.
|
||||||
|
CUSTOMER: Right.
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
104
7.3.785
Normal file
104
7.3.785
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.785
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.785 (after 7.3.776)
|
||||||
|
Problem: Crash with specific use of search pattern.
|
||||||
|
Solution: Initialize reg_buf to curbuf.
|
||||||
|
Files: src/regexp.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.784/src/regexp.c 2013-01-23 15:53:08.000000000 +0100
|
||||||
|
--- src/regexp.c 2013-01-25 20:04:14.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3413,3419 ****
|
||||||
|
* reg_startpos <invalid> reg_mmatch->startpos
|
||||||
|
* reg_endpos <invalid> reg_mmatch->endpos
|
||||||
|
* reg_win NULL window in which to search
|
||||||
|
! * reg_buf <invalid> buffer in which to search
|
||||||
|
* reg_firstlnum <invalid> first line in which to search
|
||||||
|
* reg_maxline 0 last line nr
|
||||||
|
* reg_line_lbr FALSE or TRUE FALSE
|
||||||
|
--- 3413,3419 ----
|
||||||
|
* reg_startpos <invalid> reg_mmatch->startpos
|
||||||
|
* reg_endpos <invalid> reg_mmatch->endpos
|
||||||
|
* reg_win NULL window in which to search
|
||||||
|
! * reg_buf curbuf buffer in which to search
|
||||||
|
* reg_firstlnum <invalid> first line in which to search
|
||||||
|
* reg_maxline 0 last line nr
|
||||||
|
* reg_line_lbr FALSE or TRUE FALSE
|
||||||
|
***************
|
||||||
|
*** 3571,3576 ****
|
||||||
|
--- 3571,3577 ----
|
||||||
|
reg_mmatch = NULL;
|
||||||
|
reg_maxline = 0;
|
||||||
|
reg_line_lbr = FALSE;
|
||||||
|
+ reg_buf = curbuf;
|
||||||
|
reg_win = NULL;
|
||||||
|
ireg_ic = rmp->rm_ic;
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
***************
|
||||||
|
*** 3595,3600 ****
|
||||||
|
--- 3596,3602 ----
|
||||||
|
reg_mmatch = NULL;
|
||||||
|
reg_maxline = 0;
|
||||||
|
reg_line_lbr = TRUE;
|
||||||
|
+ reg_buf = curbuf;
|
||||||
|
reg_win = NULL;
|
||||||
|
ireg_ic = rmp->rm_ic;
|
||||||
|
#ifdef FEAT_MBYTE
|
||||||
|
***************
|
||||||
|
*** 4311,4318 ****
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
! if (!vim_iswordc_buf(c, reg_buf)
|
||||||
|
! || (reginput > regline && vim_iswordc_buf(reginput[-1], reg_buf)))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
--- 4313,4320 ----
|
||||||
|
#endif
|
||||||
|
else
|
||||||
|
{
|
||||||
|
! if (!vim_iswordc_buf(c, reg_buf) || (reginput > regline
|
||||||
|
! && vim_iswordc_buf(reginput[-1], reg_buf)))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
***************
|
||||||
|
*** 7135,7140 ****
|
||||||
|
--- 7137,7143 ----
|
||||||
|
reg_match = rmp;
|
||||||
|
reg_mmatch = NULL;
|
||||||
|
reg_maxline = 0;
|
||||||
|
+ reg_buf = curbuf;
|
||||||
|
return vim_regsub_both(source, dest, copy, magic, backslash);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
*** ../vim-7.3.784/src/version.c 2013-01-25 19:28:34.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-25 20:09:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 785,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
ARTHUR: Well, I can't just call you `Man'.
|
||||||
|
DENNIS: Well, you could say `Dennis'.
|
||||||
|
ARTHUR: Well, I didn't know you were called `Dennis.'
|
||||||
|
DENNIS: Well, you didn't bother to find out, did you?
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
93
7.3.786
Normal file
93
7.3.786
Normal file
@ -0,0 +1,93 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.786
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.786
|
||||||
|
Problem: Python threads don't run in the background (issue 103).
|
||||||
|
Solution: Move the statements to manipulate thread state.
|
||||||
|
Files: src/if_python.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.785/src/if_python.c 2012-10-21 01:46:56.000000000 +0200
|
||||||
|
--- src/if_python.c 2013-01-30 11:38:06.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 740,751 ****
|
||||||
|
#else
|
||||||
|
PyMac_Initialize();
|
||||||
|
#endif
|
||||||
|
! /* Initialise threads, and save the state using PyGILState_Ensure.
|
||||||
|
! * Without the call to PyGILState_Ensure, thread specific state (such
|
||||||
|
! * as the system trace hook), will be lost between invocations of
|
||||||
|
! * Python code. */
|
||||||
|
PyEval_InitThreads();
|
||||||
|
- pygilstate = PyGILState_Ensure();
|
||||||
|
#ifdef DYNAMIC_PYTHON
|
||||||
|
get_exceptions();
|
||||||
|
#endif
|
||||||
|
--- 740,750 ----
|
||||||
|
#else
|
||||||
|
PyMac_Initialize();
|
||||||
|
#endif
|
||||||
|
! /* Initialise threads, and below save the state using
|
||||||
|
! * PyGILState_Ensure. Without the call to PyGILState_Ensure, thread
|
||||||
|
! * specific state (such as the system trace hook), will be lost
|
||||||
|
! * between invocations of Python code. */
|
||||||
|
PyEval_InitThreads();
|
||||||
|
#ifdef DYNAMIC_PYTHON
|
||||||
|
get_exceptions();
|
||||||
|
#endif
|
||||||
|
***************
|
||||||
|
*** 756,761 ****
|
||||||
|
--- 755,764 ----
|
||||||
|
if (PythonMod_Init())
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
+ /* The first python thread is vim's, release the lock. */
|
||||||
|
+ Python_SaveThread();
|
||||||
|
+ pygilstate = PyGILState_Ensure();
|
||||||
|
+
|
||||||
|
globals = PyModule_GetDict(PyImport_AddModule("__main__"));
|
||||||
|
|
||||||
|
/* Remove the element from sys.path that was added because of our
|
||||||
|
***************
|
||||||
|
*** 764,771 ****
|
||||||
|
* the current directory in sys.path. */
|
||||||
|
PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
|
||||||
|
|
||||||
|
! /* the first python thread is vim's, release the lock */
|
||||||
|
! Python_SaveThread();
|
||||||
|
|
||||||
|
initialised = 1;
|
||||||
|
}
|
||||||
|
--- 767,773 ----
|
||||||
|
* the current directory in sys.path. */
|
||||||
|
PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
|
||||||
|
|
||||||
|
! PyGILState_Release(pygilstate);
|
||||||
|
|
||||||
|
initialised = 1;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.785/src/version.c 2013-01-25 20:10:58.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 11:44:04.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 786,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
ARTHUR: I command you as King of the Britons to stand aside!
|
||||||
|
BLACK KNIGHT: I move for no man.
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
161
7.3.787
Normal file
161
7.3.787
Normal file
@ -0,0 +1,161 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.787
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.787
|
||||||
|
Problem: With 'relativenumber' set it is not possible to see the absolute
|
||||||
|
line number.
|
||||||
|
Solution: For the cursor line show the absolute line number instead of a
|
||||||
|
zero. (Nazri Ramliy)
|
||||||
|
Files: src/screen.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.786/src/screen.c 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/screen.c 2013-01-30 12:29:33.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 2319,2324 ****
|
||||||
|
--- 2319,2325 ----
|
||||||
|
{
|
||||||
|
int w = number_width(wp);
|
||||||
|
long num;
|
||||||
|
+ char *fmt = "%*ld ";
|
||||||
|
|
||||||
|
if (len > w + 1)
|
||||||
|
len = w + 1;
|
||||||
|
***************
|
||||||
|
*** 2327,2336 ****
|
||||||
|
/* 'number' */
|
||||||
|
num = (long)lnum;
|
||||||
|
else
|
||||||
|
/* 'relativenumber', don't use negative numbers */
|
||||||
|
num = labs((long)get_cursor_rel_lnum(wp, lnum));
|
||||||
|
|
||||||
|
! sprintf((char *)buf, "%*ld ", w, num);
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
if (wp->w_p_rl)
|
||||||
|
/* the line number isn't reversed */
|
||||||
|
--- 2328,2344 ----
|
||||||
|
/* 'number' */
|
||||||
|
num = (long)lnum;
|
||||||
|
else
|
||||||
|
+ {
|
||||||
|
/* 'relativenumber', don't use negative numbers */
|
||||||
|
num = labs((long)get_cursor_rel_lnum(wp, lnum));
|
||||||
|
+ if (num == 0)
|
||||||
|
+ {
|
||||||
|
+ num = lnum;
|
||||||
|
+ fmt = "%-*ld ";
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
! sprintf((char *)buf, fmt, w, num);
|
||||||
|
#ifdef FEAT_RIGHTLEFT
|
||||||
|
if (wp->w_p_rl)
|
||||||
|
/* the line number isn't reversed */
|
||||||
|
***************
|
||||||
|
*** 3484,3498 ****
|
||||||
|
)
|
||||||
|
{
|
||||||
|
long num;
|
||||||
|
|
||||||
|
if (wp->w_p_nu)
|
||||||
|
/* 'number' */
|
||||||
|
num = (long)lnum;
|
||||||
|
else
|
||||||
|
/* 'relativenumber', don't use negative numbers */
|
||||||
|
num = labs((long)get_cursor_rel_lnum(wp, lnum));
|
||||||
|
|
||||||
|
! sprintf((char *)extra, "%*ld ",
|
||||||
|
number_width(wp), num);
|
||||||
|
if (wp->w_skipcol > 0)
|
||||||
|
for (p_extra = extra; *p_extra == ' '; ++p_extra)
|
||||||
|
--- 3492,3514 ----
|
||||||
|
)
|
||||||
|
{
|
||||||
|
long num;
|
||||||
|
+ char *fmt = "%*ld ";
|
||||||
|
|
||||||
|
if (wp->w_p_nu)
|
||||||
|
/* 'number' */
|
||||||
|
num = (long)lnum;
|
||||||
|
else
|
||||||
|
+ {
|
||||||
|
/* 'relativenumber', don't use negative numbers */
|
||||||
|
num = labs((long)get_cursor_rel_lnum(wp, lnum));
|
||||||
|
+ if (num == 0)
|
||||||
|
+ {
|
||||||
|
+ num = lnum;
|
||||||
|
+ fmt = "%-*ld ";
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
! sprintf((char *)extra, fmt,
|
||||||
|
number_width(wp), num);
|
||||||
|
if (wp->w_skipcol > 0)
|
||||||
|
for (p_extra = extra; *p_extra == ' '; ++p_extra)
|
||||||
|
***************
|
||||||
|
*** 3513,3519 ****
|
||||||
|
* the current line differently.
|
||||||
|
* TODO: Can we use CursorLine instead of CursorLineNr
|
||||||
|
* when CursorLineNr isn't set? */
|
||||||
|
! if (wp->w_p_cul && lnum == wp->w_cursor.lnum)
|
||||||
|
char_attr = hl_attr(HLF_CLN);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
--- 3529,3536 ----
|
||||||
|
* the current line differently.
|
||||||
|
* TODO: Can we use CursorLine instead of CursorLineNr
|
||||||
|
* when CursorLineNr isn't set? */
|
||||||
|
! if ((wp->w_p_cul || wp->w_p_rnu)
|
||||||
|
! && lnum == wp->w_cursor.lnum)
|
||||||
|
char_attr = hl_attr(HLF_CLN);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
***************
|
||||||
|
*** 10238,10249 ****
|
||||||
|
int n;
|
||||||
|
linenr_T lnum;
|
||||||
|
|
||||||
|
! if (wp->w_p_nu)
|
||||||
|
! /* 'number' */
|
||||||
|
! lnum = wp->w_buffer->b_ml.ml_line_count;
|
||||||
|
! else
|
||||||
|
! /* 'relativenumber' */
|
||||||
|
! lnum = wp->w_height;
|
||||||
|
|
||||||
|
if (lnum == wp->w_nrwidth_line_count)
|
||||||
|
return wp->w_nrwidth_width;
|
||||||
|
--- 10255,10261 ----
|
||||||
|
int n;
|
||||||
|
linenr_T lnum;
|
||||||
|
|
||||||
|
! lnum = wp->w_buffer->b_ml.ml_line_count;
|
||||||
|
|
||||||
|
if (lnum == wp->w_nrwidth_line_count)
|
||||||
|
return wp->w_nrwidth_width;
|
||||||
|
*** ../vim-7.3.786/src/version.c 2013-01-30 11:44:33.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 12:25:10.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 787,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
ARTHUR: A scratch? Your arm's off!
|
||||||
|
BLACK KNIGHT: No, it isn't.
|
||||||
|
ARTHUR: Well, what's that then?
|
||||||
|
BLACK KNIGHT: I've had worse.
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
48
7.3.788
Normal file
48
7.3.788
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.788
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.788
|
||||||
|
Problem: When only using patches build fails on missing nl.po.
|
||||||
|
Solution: Create an empty nl.po file.
|
||||||
|
Files: src/po/Makefile
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.787/src/po/Makefile 2013-01-17 13:35:13.000000000 +0100
|
||||||
|
--- src/po/Makefile 2013-01-30 12:50:41.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 176,181 ****
|
||||||
|
--- 176,185 ----
|
||||||
|
|
||||||
|
converted: $(MOCONVERTED)
|
||||||
|
|
||||||
|
+ # nl.po was added later, if it does not exist use an empty file.
|
||||||
|
+ nl.po:
|
||||||
|
+ touch nl.po
|
||||||
|
+
|
||||||
|
# Norwegian/Bokmal: "nb" is an alias for "no".
|
||||||
|
# Copying the file is not efficient, but I don't know of another way to make
|
||||||
|
# this work.
|
||||||
|
*** ../vim-7.3.787/src/version.c 2013-01-30 12:31:32.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 12:45:32.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 788,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
"It's so simple to be wise. Just think of something stupid to say
|
||||||
|
and then don't say it." -- Sam Levenson
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
185
7.3.789
Normal file
185
7.3.789
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.789
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.789 (after 7.3.776)
|
||||||
|
Problem: "\k" in regexp does not work in other window.
|
||||||
|
Solution: Use the right buffer. (Yukihiro Nakadaira)
|
||||||
|
Files: src/mbyte.c, src/proto/mbyte.pro, src/regexp.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.788/src/mbyte.c 2013-01-23 16:19:17.000000000 +0100
|
||||||
|
--- src/mbyte.c 2013-01-30 13:53:07.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 869,879 ****
|
||||||
|
mb_get_class(p)
|
||||||
|
char_u *p;
|
||||||
|
{
|
||||||
|
if (MB_BYTE2LEN(p[0]) == 1)
|
||||||
|
{
|
||||||
|
if (p[0] == NUL || vim_iswhite(p[0]))
|
||||||
|
return 0;
|
||||||
|
! if (vim_iswordc(p[0]))
|
||||||
|
return 2;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
--- 869,887 ----
|
||||||
|
mb_get_class(p)
|
||||||
|
char_u *p;
|
||||||
|
{
|
||||||
|
+ return mb_get_class_buf(p, curbuf);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ int
|
||||||
|
+ mb_get_class_buf(p, buf)
|
||||||
|
+ char_u *p;
|
||||||
|
+ buf_T *buf;
|
||||||
|
+ {
|
||||||
|
if (MB_BYTE2LEN(p[0]) == 1)
|
||||||
|
{
|
||||||
|
if (p[0] == NUL || vim_iswhite(p[0]))
|
||||||
|
return 0;
|
||||||
|
! if (vim_iswordc_buf(p[0], buf))
|
||||||
|
return 2;
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.788/src/proto/mbyte.pro 2011-08-10 13:21:30.000000000 +0200
|
||||||
|
--- src/proto/mbyte.pro 2013-01-30 13:53:27.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4,9 ****
|
||||||
|
--- 4,10 ----
|
||||||
|
int bomb_size __ARGS((void));
|
||||||
|
void remove_bom __ARGS((char_u *s));
|
||||||
|
int mb_get_class __ARGS((char_u *p));
|
||||||
|
+ int mb_get_class_buf __ARGS((char_u *p, buf_T *buf));
|
||||||
|
int dbcs_class __ARGS((unsigned lead, unsigned trail));
|
||||||
|
int latin_char2len __ARGS((int c));
|
||||||
|
int latin_char2bytes __ARGS((int c, char_u *buf));
|
||||||
|
*** ../vim-7.3.788/src/regexp.c 2013-01-25 20:10:58.000000000 +0100
|
||||||
|
--- src/regexp.c 2013-01-30 13:55:39.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4013,4020 ****
|
||||||
|
reg_prev_class()
|
||||||
|
{
|
||||||
|
if (reginput > regline)
|
||||||
|
! return mb_get_class(reginput - 1
|
||||||
|
! - (*mb_head_off)(regline, reginput - 1));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 4013,4020 ----
|
||||||
|
reg_prev_class()
|
||||||
|
{
|
||||||
|
if (reginput > regline)
|
||||||
|
! return mb_get_class_buf(reginput - 1
|
||||||
|
! - (*mb_head_off)(regline, reginput - 1), reg_buf);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 4304,4310 ****
|
||||||
|
int this_class;
|
||||||
|
|
||||||
|
/* Get class of current and previous char (if it exists). */
|
||||||
|
! this_class = mb_get_class(reginput);
|
||||||
|
if (this_class <= 1)
|
||||||
|
status = RA_NOMATCH; /* not on a word at all */
|
||||||
|
else if (reg_prev_class() == this_class)
|
||||||
|
--- 4304,4310 ----
|
||||||
|
int this_class;
|
||||||
|
|
||||||
|
/* Get class of current and previous char (if it exists). */
|
||||||
|
! this_class = mb_get_class_buf(reginput, reg_buf);
|
||||||
|
if (this_class <= 1)
|
||||||
|
status = RA_NOMATCH; /* not on a word at all */
|
||||||
|
else if (reg_prev_class() == this_class)
|
||||||
|
***************
|
||||||
|
*** 4328,4334 ****
|
||||||
|
int this_class, prev_class;
|
||||||
|
|
||||||
|
/* Get class of current and previous char (if it exists). */
|
||||||
|
! this_class = mb_get_class(reginput);
|
||||||
|
prev_class = reg_prev_class();
|
||||||
|
if (this_class == prev_class
|
||||||
|
|| prev_class == 0 || prev_class == 1)
|
||||||
|
--- 4328,4334 ----
|
||||||
|
int this_class, prev_class;
|
||||||
|
|
||||||
|
/* Get class of current and previous char (if it exists). */
|
||||||
|
! this_class = mb_get_class_buf(reginput, reg_buf);
|
||||||
|
prev_class = reg_prev_class();
|
||||||
|
if (this_class == prev_class
|
||||||
|
|| prev_class == 0 || prev_class == 1)
|
||||||
|
***************
|
||||||
|
*** 4365,4378 ****
|
||||||
|
break;
|
||||||
|
|
||||||
|
case KWORD:
|
||||||
|
! if (!vim_iswordp(reginput))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
else
|
||||||
|
ADVANCE_REGINPUT();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SKWORD:
|
||||||
|
! if (VIM_ISDIGIT(*reginput) || !vim_iswordp(reginput))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
else
|
||||||
|
ADVANCE_REGINPUT();
|
||||||
|
--- 4365,4378 ----
|
||||||
|
break;
|
||||||
|
|
||||||
|
case KWORD:
|
||||||
|
! if (!vim_iswordp_buf(reginput, reg_buf))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
else
|
||||||
|
ADVANCE_REGINPUT();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SKWORD:
|
||||||
|
! if (VIM_ISDIGIT(*reginput) || !vim_iswordp_buf(reginput, reg_buf))
|
||||||
|
status = RA_NOMATCH;
|
||||||
|
else
|
||||||
|
ADVANCE_REGINPUT();
|
||||||
|
***************
|
||||||
|
*** 5734,5740 ****
|
||||||
|
case SKWORD + ADD_NL:
|
||||||
|
while (count < maxcount)
|
||||||
|
{
|
||||||
|
! if (vim_iswordp(scan) && (testval || !VIM_ISDIGIT(*scan)))
|
||||||
|
{
|
||||||
|
mb_ptr_adv(scan);
|
||||||
|
}
|
||||||
|
--- 5734,5741 ----
|
||||||
|
case SKWORD + ADD_NL:
|
||||||
|
while (count < maxcount)
|
||||||
|
{
|
||||||
|
! if (vim_iswordp_buf(scan, reg_buf)
|
||||||
|
! && (testval || !VIM_ISDIGIT(*scan)))
|
||||||
|
{
|
||||||
|
mb_ptr_adv(scan);
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.788/src/version.c 2013-01-30 12:50:50.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 13:58:07.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 789,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
MARTHA'S WAY: Don't throw out all that leftover wine. Freeze into ice cubes
|
||||||
|
for future use in casseroles and sauces.
|
||||||
|
MY WAY: What leftover wine?
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
52
7.3.790
Normal file
52
7.3.790
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.790
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.790
|
||||||
|
Problem: After reloading a buffer the modelines are not processed.
|
||||||
|
Solution: call do_modelines(). (Ken Takata)
|
||||||
|
Files: src/fileio.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.789/src/fileio.c 2012-12-05 19:13:11.000000000 +0100
|
||||||
|
--- src/fileio.c 2013-01-30 14:08:21.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7243,7248 ****
|
||||||
|
--- 7243,7251 ----
|
||||||
|
* reset it, might have had a read error. */
|
||||||
|
if (orig_mode == curbuf->b_orig_mode)
|
||||||
|
curbuf->b_p_ro |= old_ro;
|
||||||
|
+
|
||||||
|
+ /* Modelines must override settings done by autocommands. */
|
||||||
|
+ do_modelines(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* restore curwin/curbuf and a few other things */
|
||||||
|
*** ../vim-7.3.789/src/version.c 2013-01-30 13:59:31.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 14:02:30.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 790,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
BLACK KNIGHT: Come on you pansy!
|
||||||
|
[hah] [parry thrust]
|
||||||
|
[ARTHUR chops the BLACK KNIGHT's right arm off]
|
||||||
|
ARTHUR: Victory is mine! [kneeling]
|
||||||
|
We thank thee Lord, that in thy merc-
|
||||||
|
[Black Knight kicks Arthur in the head while he is praying]
|
||||||
|
The Quest for the Holy Grail (Monty Python)
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
131
7.3.792
Normal file
131
7.3.792
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.792
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.792
|
||||||
|
Problem: ":substitute" works differently without confirmation.
|
||||||
|
Solution: Do not change the text when asking for confirmation, only display
|
||||||
|
it.
|
||||||
|
Files: src/ex_cmds.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.791/src/ex_cmds.c 2013-01-17 18:33:58.000000000 +0100
|
||||||
|
--- src/ex_cmds.c 2013-01-30 16:01:58.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4727,4732 ****
|
||||||
|
--- 4727,4734 ----
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
+ char_u *orig_line = NULL;
|
||||||
|
+ int len_change = 0;
|
||||||
|
#ifdef FEAT_FOLDING
|
||||||
|
int save_p_fen = curwin->w_p_fen;
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 4737,4745 ****
|
||||||
|
temp = RedrawingDisabled;
|
||||||
|
RedrawingDisabled = 0;
|
||||||
|
|
||||||
|
search_match_lines = regmatch.endpos[0].lnum
|
||||||
|
- regmatch.startpos[0].lnum;
|
||||||
|
! search_match_endcol = regmatch.endpos[0].col;
|
||||||
|
highlight_match = TRUE;
|
||||||
|
|
||||||
|
update_topline();
|
||||||
|
--- 4739,4781 ----
|
||||||
|
temp = RedrawingDisabled;
|
||||||
|
RedrawingDisabled = 0;
|
||||||
|
|
||||||
|
+ if (new_start != NULL)
|
||||||
|
+ {
|
||||||
|
+ /* There already was a substitution, we would
|
||||||
|
+ * like to show this to the user. We cannot
|
||||||
|
+ * really update the line, it would change
|
||||||
|
+ * what matches. Temporarily replace the line
|
||||||
|
+ * and change it back afterwards. */
|
||||||
|
+ orig_line = vim_strsave(ml_get(lnum));
|
||||||
|
+ if (orig_line != NULL)
|
||||||
|
+ {
|
||||||
|
+ char_u *new_line = concat_str(new_start,
|
||||||
|
+ sub_firstline + copycol);
|
||||||
|
+
|
||||||
|
+ if (new_line == NULL)
|
||||||
|
+ {
|
||||||
|
+ vim_free(orig_line);
|
||||||
|
+ orig_line = NULL;
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ /* Position the cursor relative to the
|
||||||
|
+ * end of the line, the previous
|
||||||
|
+ * substitute may have inserted or
|
||||||
|
+ * deleted characters before the
|
||||||
|
+ * cursor. */
|
||||||
|
+ len_change = STRLEN(new_line)
|
||||||
|
+ - STRLEN(orig_line);
|
||||||
|
+ curwin->w_cursor.col += len_change;
|
||||||
|
+ ml_replace(lnum, new_line, FALSE);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
search_match_lines = regmatch.endpos[0].lnum
|
||||||
|
- regmatch.startpos[0].lnum;
|
||||||
|
! search_match_endcol = regmatch.endpos[0].col
|
||||||
|
! + len_change;
|
||||||
|
highlight_match = TRUE;
|
||||||
|
|
||||||
|
update_topline();
|
||||||
|
***************
|
||||||
|
*** 4781,4786 ****
|
||||||
|
--- 4817,4826 ----
|
||||||
|
msg_didout = FALSE; /* don't scroll up */
|
||||||
|
msg_col = 0;
|
||||||
|
gotocmdline(TRUE);
|
||||||
|
+
|
||||||
|
+ /* restore the line */
|
||||||
|
+ if (orig_line != NULL)
|
||||||
|
+ ml_replace(lnum, orig_line, FALSE);
|
||||||
|
}
|
||||||
|
|
||||||
|
need_wait_return = FALSE; /* no hit-return prompt */
|
||||||
|
***************
|
||||||
|
*** 5045,5058 ****
|
||||||
|
* The check for nmatch_tl is needed for when multi-line
|
||||||
|
* matching must replace the lines before trying to do another
|
||||||
|
* match, otherwise "\@<=" won't work.
|
||||||
|
- * When asking the user we like to show the already replaced
|
||||||
|
- * text, but don't do it when "\<@=" or "\<@!" is used, it
|
||||||
|
- * changes what matches.
|
||||||
|
* When the match starts below where we start searching also
|
||||||
|
* need to replace the line first (using \zs after \n).
|
||||||
|
*/
|
||||||
|
if (lastone
|
||||||
|
- || (do_ask && !re_lookbehind(regmatch.regprog))
|
||||||
|
|| nmatch_tl > 0
|
||||||
|
|| (nmatch = vim_regexec_multi(®match, curwin,
|
||||||
|
curbuf, sub_firstlnum,
|
||||||
|
--- 5085,5094 ----
|
||||||
|
*** ../vim-7.3.791/src/version.c 2013-01-30 14:55:35.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 16:25:36.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 792,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Trees moving back and forth is what makes the wind blow.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
72
7.3.793
Normal file
72
7.3.793
Normal file
@ -0,0 +1,72 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.793
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.793 (after 7.3.792)
|
||||||
|
Problem: New interactive :substutite behavior is not tested.
|
||||||
|
Solution: Add tests. (Christian Brabandt)
|
||||||
|
Files: src/testdir/test80.in, src/testdir/test80.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.792/src/testdir/test80.in 2011-06-19 04:31:54.000000000 +0200
|
||||||
|
--- src/testdir/test80.in 2013-01-30 17:00:54.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 144,149 ****
|
||||||
|
--- 144,164 ----
|
||||||
|
TEST_8:
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
+ :set magic&
|
||||||
|
+ :set cpo&
|
||||||
|
+ :$put =\"\n\nTEST_8:\"
|
||||||
|
+ :$put =',,X'
|
||||||
|
+ :s/\(^\|,\)\ze\(,\|X\)/\1N/g
|
||||||
|
+ :$put =',,Y'
|
||||||
|
+ :s/\(^\|,\)\ze\(,\|Y\)/\1N/gc
|
||||||
|
+ a:$put =',,Z'
|
||||||
|
+ :s/\(^\|,\)\ze\(,\|Z\)/\1N/gc
|
||||||
|
+ yy/^TEST_9
|
||||||
|
+ ENDTEST
|
||||||
|
+
|
||||||
|
+ TEST_9:
|
||||||
|
+
|
||||||
|
+ STARTTEST
|
||||||
|
:/^Results/,$wq! test.out
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
*** ../vim-7.3.792/src/testdir/test80.ok 2011-06-19 04:31:54.000000000 +0200
|
||||||
|
--- src/testdir/test80.ok 2013-01-30 16:46:39.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 99,101 ****
|
||||||
|
--- 99,107 ----
|
||||||
|
A
A
|
||||||
|
B
|
||||||
|
B
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ TEST_8:
|
||||||
|
+ N,,NX
|
||||||
|
+ N,,NY
|
||||||
|
+ N,,NZ
|
||||||
|
*** ../vim-7.3.792/src/version.c 2013-01-30 16:30:19.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 17:01:33.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 793,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
The early bird gets the worm. The second mouse gets the cheese.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
75
7.3.794
Normal file
75
7.3.794
Normal file
@ -0,0 +1,75 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.794
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.794
|
||||||
|
Problem: Tiny build fails. (Tony Mechelynck)
|
||||||
|
Solution: Adjust #ifdefs.
|
||||||
|
Files: src/charset.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.793/src/charset.c 2013-01-23 15:53:08.000000000 +0100
|
||||||
|
--- src/charset.c 2013-01-30 17:08:05.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 939,957 ****
|
||||||
|
return GET_CHARTAB(curbuf, *p) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
- #if defined(FEAT_SYN_HL) || defined(PROTO)
|
||||||
|
int
|
||||||
|
vim_iswordp_buf(p, buf)
|
||||||
|
char_u *p;
|
||||||
|
buf_T *buf;
|
||||||
|
{
|
||||||
|
! # ifdef FEAT_MBYTE
|
||||||
|
if (has_mbyte && MB_BYTE2LEN(*p) > 1)
|
||||||
|
return mb_get_class(p) >= 2;
|
||||||
|
! # endif
|
||||||
|
return (GET_CHARTAB(buf, *p) != 0);
|
||||||
|
}
|
||||||
|
- #endif
|
||||||
|
|
||||||
|
/*
|
||||||
|
* return TRUE if 'c' is a valid file-name character
|
||||||
|
--- 939,955 ----
|
||||||
|
return GET_CHARTAB(curbuf, *p) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
vim_iswordp_buf(p, buf)
|
||||||
|
char_u *p;
|
||||||
|
buf_T *buf;
|
||||||
|
{
|
||||||
|
! #ifdef FEAT_MBYTE
|
||||||
|
if (has_mbyte && MB_BYTE2LEN(*p) > 1)
|
||||||
|
return mb_get_class(p) >= 2;
|
||||||
|
! #endif
|
||||||
|
return (GET_CHARTAB(buf, *p) != 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* return TRUE if 'c' is a valid file-name character
|
||||||
|
*** ../vim-7.3.793/src/version.c 2013-01-30 17:03:25.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 17:28:04.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 794,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
LAUNCELOT: I am, sir. I am a Knight of King Arthur.
|
||||||
|
FATHER: 'Mm ... very nice castle, Camelot ... very good pig country....
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
212
7.3.795
Normal file
212
7.3.795
Normal file
@ -0,0 +1,212 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.795
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.795
|
||||||
|
Problem: MzScheme does not build with tiny features.
|
||||||
|
Solution: Add #ifdefs. Also add UNUSED to avoid warnings. And change
|
||||||
|
library ordering.
|
||||||
|
Files: src/if_mzsch.c, src/Makefile
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.794/src/if_mzsch.c 2013-01-30 14:55:35.000000000 +0100
|
||||||
|
--- src/if_mzsch.c 2013-01-30 17:23:07.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1483,1489 ****
|
||||||
|
|
||||||
|
/* (eval {expr-string}) */
|
||||||
|
static Scheme_Object *
|
||||||
|
! vim_eval(void *data, int argc, Scheme_Object **argv)
|
||||||
|
{
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
--- 1483,1489 ----
|
||||||
|
|
||||||
|
/* (eval {expr-string}) */
|
||||||
|
static Scheme_Object *
|
||||||
|
! vim_eval(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
|
||||||
|
{
|
||||||
|
#ifdef FEAT_EVAL
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
***************
|
||||||
|
*** 1686,1695 ****
|
||||||
|
static Scheme_Object *
|
||||||
|
get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
|
||||||
|
{
|
||||||
|
- win_T *w;
|
||||||
|
int n = 0;
|
||||||
|
|
||||||
|
for (w = firstwin; w != NULL; w = w->w_next)
|
||||||
|
++n;
|
||||||
|
return scheme_make_integer(n);
|
||||||
|
}
|
||||||
|
--- 1686,1697 ----
|
||||||
|
static Scheme_Object *
|
||||||
|
get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
|
||||||
|
{
|
||||||
|
int n = 0;
|
||||||
|
+ #ifdef FEAT_WINDOWS
|
||||||
|
+ win_T *w;
|
||||||
|
|
||||||
|
for (w = firstwin; w != NULL; w = w->w_next)
|
||||||
|
+ #endif
|
||||||
|
++n;
|
||||||
|
return scheme_make_integer(n);
|
||||||
|
}
|
||||||
|
***************
|
||||||
|
*** 1701,1712 ****
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
vim_mz_buffer *buf;
|
||||||
|
Scheme_Object *list;
|
||||||
|
! win_T *w;
|
||||||
|
|
||||||
|
buf = get_buffer_arg(prim->name, 0, argc, argv);
|
||||||
|
list = scheme_null;
|
||||||
|
|
||||||
|
! for (w = firstwin; w != NULL; w = w->w_next)
|
||||||
|
if (w->w_buffer == buf->buf)
|
||||||
|
{
|
||||||
|
list = scheme_make_pair(window_new(w), list);
|
||||||
|
--- 1703,1716 ----
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
vim_mz_buffer *buf;
|
||||||
|
Scheme_Object *list;
|
||||||
|
! win_T *w = firstwin;
|
||||||
|
|
||||||
|
buf = get_buffer_arg(prim->name, 0, argc, argv);
|
||||||
|
list = scheme_null;
|
||||||
|
|
||||||
|
! #ifdef FEAT_WINDOWS
|
||||||
|
! for ( ; w != NULL; w = w->w_next)
|
||||||
|
! #endif
|
||||||
|
if (w->w_buffer == buf->buf)
|
||||||
|
{
|
||||||
|
list = scheme_make_pair(window_new(w), list);
|
||||||
|
***************
|
||||||
|
*** 1755,1768 ****
|
||||||
|
|
||||||
|
/* (get-win-num [window]) */
|
||||||
|
static Scheme_Object *
|
||||||
|
! get_window_num(void *data, int argc, Scheme_Object **argv)
|
||||||
|
{
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
win_T *win = get_window_arg(prim->name, 0, argc, argv)->win;
|
||||||
|
- int nr = 1;
|
||||||
|
win_T *wp;
|
||||||
|
|
||||||
|
for (wp = firstwin; wp != win; wp = wp->w_next)
|
||||||
|
++nr;
|
||||||
|
|
||||||
|
return scheme_make_integer(nr);
|
||||||
|
--- 1759,1774 ----
|
||||||
|
|
||||||
|
/* (get-win-num [window]) */
|
||||||
|
static Scheme_Object *
|
||||||
|
! get_window_num(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
|
||||||
|
{
|
||||||
|
+ int nr = 1;
|
||||||
|
+ #ifdef FEAT_WINDOWS
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
win_T *win = get_window_arg(prim->name, 0, argc, argv)->win;
|
||||||
|
win_T *wp;
|
||||||
|
|
||||||
|
for (wp = firstwin; wp != win; wp = wp->w_next)
|
||||||
|
+ #endif
|
||||||
|
++nr;
|
||||||
|
|
||||||
|
return scheme_make_integer(nr);
|
||||||
|
***************
|
||||||
|
*** 1773,1786 ****
|
||||||
|
get_window_by_num(void *data, int argc, Scheme_Object **argv)
|
||||||
|
{
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
! win_T *win;
|
||||||
|
int fnum;
|
||||||
|
|
||||||
|
fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0));
|
||||||
|
if (fnum < 1)
|
||||||
|
scheme_signal_error(_("window index is out of range"));
|
||||||
|
|
||||||
|
! for (win = firstwin; win != NULL; win = win->w_next, --fnum)
|
||||||
|
if (fnum == 1) /* to be 1-based */
|
||||||
|
return window_new(win);
|
||||||
|
|
||||||
|
--- 1779,1794 ----
|
||||||
|
get_window_by_num(void *data, int argc, Scheme_Object **argv)
|
||||||
|
{
|
||||||
|
Vim_Prim *prim = (Vim_Prim *)data;
|
||||||
|
! win_T *win = firstwin;
|
||||||
|
int fnum;
|
||||||
|
|
||||||
|
fnum = SCHEME_INT_VAL(GUARANTEE_INTEGER(prim->name, 0));
|
||||||
|
if (fnum < 1)
|
||||||
|
scheme_signal_error(_("window index is out of range"));
|
||||||
|
|
||||||
|
! #ifdef FEAT_WINDOWS
|
||||||
|
! for ( ; win != NULL; win = win->w_next, --fnum)
|
||||||
|
! #endif
|
||||||
|
if (fnum == 1) /* to be 1-based */
|
||||||
|
return window_new(win);
|
||||||
|
|
||||||
|
*** ../vim-7.3.794/src/Makefile 2012-11-20 17:03:23.000000000 +0100
|
||||||
|
--- src/Makefile 2013-01-30 17:34:55.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1345,1350 ****
|
||||||
|
--- 1345,1352 ----
|
||||||
|
|
||||||
|
DEPEND_CFLAGS = -DPROTO -DDEPEND -DFEAT_GUI $(LINT_CFLAGS)
|
||||||
|
|
||||||
|
+ # Note: MZSCHEME_LIBS must come before LIBS, because LIBS adds -lm which is
|
||||||
|
+ # needed by racket.
|
||||||
|
ALL_LIB_DIRS = $(GUI_LIBS_DIR) $(X_LIBS_DIR)
|
||||||
|
ALL_LIBS = \
|
||||||
|
$(GUI_LIBS1) \
|
||||||
|
***************
|
||||||
|
*** 1353,1362 ****
|
||||||
|
$(X_PRE_LIBS) \
|
||||||
|
$(X_LIBS) \
|
||||||
|
$(X_EXTRA_LIBS) \
|
||||||
|
$(LIBS) \
|
||||||
|
$(EXTRA_LIBS) \
|
||||||
|
$(LUA_LIBS) \
|
||||||
|
- $(MZSCHEME_LIBS) \
|
||||||
|
$(PERL_LIBS) \
|
||||||
|
$(PYTHON_LIBS) \
|
||||||
|
$(PYTHON3_LIBS) \
|
||||||
|
--- 1355,1364 ----
|
||||||
|
$(X_PRE_LIBS) \
|
||||||
|
$(X_LIBS) \
|
||||||
|
$(X_EXTRA_LIBS) \
|
||||||
|
+ $(MZSCHEME_LIBS) \
|
||||||
|
$(LIBS) \
|
||||||
|
$(EXTRA_LIBS) \
|
||||||
|
$(LUA_LIBS) \
|
||||||
|
$(PERL_LIBS) \
|
||||||
|
$(PYTHON_LIBS) \
|
||||||
|
$(PYTHON3_LIBS) \
|
||||||
|
*** ../vim-7.3.794/src/version.c 2013-01-30 17:30:14.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 17:38:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 795,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
GUEST: He's killed the best man!
|
||||||
|
SECOND GUEST: (holding a limp WOMAN) He's killed my auntie.
|
||||||
|
FATHER: No, please! This is supposed to be a happy occasion! Let's
|
||||||
|
not bicker and argue about who killed who ...
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
58
7.3.797
Normal file
58
7.3.797
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.797
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.797 (after 7.3.792)
|
||||||
|
Problem: Compiler warning for size_t to int conversion. (Skeept)
|
||||||
|
Solution: Add type casts.
|
||||||
|
Files: src/ex_cmds.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.796/src/ex_cmds.c 2013-01-30 16:30:19.000000000 +0100
|
||||||
|
--- src/ex_cmds.c 2013-01-30 21:52:17.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4764,4771 ****
|
||||||
|
* substitute may have inserted or
|
||||||
|
* deleted characters before the
|
||||||
|
* cursor. */
|
||||||
|
! len_change = STRLEN(new_line)
|
||||||
|
! - STRLEN(orig_line);
|
||||||
|
curwin->w_cursor.col += len_change;
|
||||||
|
ml_replace(lnum, new_line, FALSE);
|
||||||
|
}
|
||||||
|
--- 4764,4771 ----
|
||||||
|
* substitute may have inserted or
|
||||||
|
* deleted characters before the
|
||||||
|
* cursor. */
|
||||||
|
! len_change = (int)STRLEN(new_line)
|
||||||
|
! - (int)STRLEN(orig_line);
|
||||||
|
curwin->w_cursor.col += len_change;
|
||||||
|
ml_replace(lnum, new_line, FALSE);
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.796/src/version.c 2013-01-30 21:55:22.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-30 21:53:17.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 797,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
[SIR LAUNCELOT runs back up the stairs, grabs a rope
|
||||||
|
of the wall and swings out over the heads of the CROWD in a
|
||||||
|
swashbuckling manner towards a large window. He stops just short
|
||||||
|
of the window and is left swing pathetically back and forth.]
|
||||||
|
LAUNCELOT: Excuse me ... could somebody give me a push ...
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
103
7.3.798
Normal file
103
7.3.798
Normal file
@ -0,0 +1,103 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.798
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.798 (after 7.3.791)
|
||||||
|
Problem: MzScheme: circular list does not work correctly.
|
||||||
|
Solution: Separate Mac-specific code from generic code. (Sergey Khorev)
|
||||||
|
Files: src/if_mzsch.c, src/testdir/test70.in
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.797/src/if_mzsch.c 2013-01-30 17:41:43.000000000 +0100
|
||||||
|
--- src/if_mzsch.c 2013-01-31 21:00:02.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 965,970 ****
|
||||||
|
--- 965,971 ----
|
||||||
|
#ifdef MZSCHEME_COLLECTS
|
||||||
|
/* setup 'current-library-collection-paths' parameter */
|
||||||
|
# if MZSCHEME_VERSION_MAJOR >= 299
|
||||||
|
+ # ifdef MACOS
|
||||||
|
{
|
||||||
|
Scheme_Object *coll_byte_string = NULL;
|
||||||
|
Scheme_Object *coll_char_string = NULL;
|
||||||
|
***************
|
||||||
|
*** 985,990 ****
|
||||||
|
--- 986,1021 ----
|
||||||
|
MZ_GC_CHECK();
|
||||||
|
MZ_GC_UNREG();
|
||||||
|
}
|
||||||
|
+ # else
|
||||||
|
+ {
|
||||||
|
+ Scheme_Object *coll_byte_string = NULL;
|
||||||
|
+ Scheme_Object *coll_char_string = NULL;
|
||||||
|
+ Scheme_Object *coll_path = NULL;
|
||||||
|
+ Scheme_Object *coll_pair = NULL;
|
||||||
|
+ Scheme_Config *config = NULL;
|
||||||
|
+
|
||||||
|
+ MZ_GC_DECL_REG(5);
|
||||||
|
+ MZ_GC_VAR_IN_REG(0, coll_byte_string);
|
||||||
|
+ MZ_GC_VAR_IN_REG(1, coll_char_string);
|
||||||
|
+ MZ_GC_VAR_IN_REG(2, coll_path);
|
||||||
|
+ MZ_GC_VAR_IN_REG(3, coll_pair);
|
||||||
|
+ MZ_GC_VAR_IN_REG(4, config);
|
||||||
|
+ MZ_GC_REG();
|
||||||
|
+ coll_byte_string = scheme_make_byte_string(MZSCHEME_COLLECTS);
|
||||||
|
+ MZ_GC_CHECK();
|
||||||
|
+ coll_char_string = scheme_byte_string_to_char_string(coll_byte_string);
|
||||||
|
+ MZ_GC_CHECK();
|
||||||
|
+ coll_path = scheme_char_string_to_path(coll_char_string);
|
||||||
|
+ MZ_GC_CHECK();
|
||||||
|
+ coll_pair = scheme_make_pair(coll_path, scheme_null);
|
||||||
|
+ MZ_GC_CHECK();
|
||||||
|
+ config = scheme_current_config();
|
||||||
|
+ MZ_GC_CHECK();
|
||||||
|
+ scheme_set_param(config, MZCONFIG_COLLECTION_PATHS, coll_pair);
|
||||||
|
+ MZ_GC_CHECK();
|
||||||
|
+ MZ_GC_UNREG();
|
||||||
|
+ }
|
||||||
|
+ # endif
|
||||||
|
# else
|
||||||
|
{
|
||||||
|
Scheme_Object *coll_string = NULL;
|
||||||
|
*** ../vim-7.3.797/src/testdir/test70.in 2013-01-30 14:55:35.000000000 +0100
|
||||||
|
--- src/testdir/test70.in 2013-01-31 21:00:06.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 38,45 ****
|
||||||
|
:" circular list (at the same time test lists containing lists)
|
||||||
|
:mz (set-car! (cddr l) l)
|
||||||
|
:let l2 = mzeval("h")["list"]
|
||||||
|
! :" bug: this returns item2, but it should be l2
|
||||||
|
! :if l2[2] == "item2"
|
||||||
|
:let res = "OK"
|
||||||
|
:else
|
||||||
|
:let res = "FAILED: " . l2[2]
|
||||||
|
--- 38,44 ----
|
||||||
|
:" circular list (at the same time test lists containing lists)
|
||||||
|
:mz (set-car! (cddr l) l)
|
||||||
|
:let l2 = mzeval("h")["list"]
|
||||||
|
! :if l2[2] == l2
|
||||||
|
:let res = "OK"
|
||||||
|
:else
|
||||||
|
:let res = "FAILED: " . l2[2]
|
||||||
|
*** ../vim-7.3.797/src/version.c 2013-01-30 21:55:45.000000000 +0100
|
||||||
|
--- src/version.c 2013-01-31 21:01:48.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 798,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Be nice to your kids... they'll be the ones choosing your nursing home.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
58
7.3.799
Normal file
58
7.3.799
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.799
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.799
|
||||||
|
Problem: The color column is not correct when entering a buffer. (Ben
|
||||||
|
Fritz)
|
||||||
|
Solution: Call check_colorcolumn() if 'textwidth' changed. (Christian
|
||||||
|
Brabandt)
|
||||||
|
Files: src/buffer.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.798/src/buffer.c 2012-11-20 12:16:54.000000000 +0100
|
||||||
|
--- src/buffer.c 2013-02-06 11:52:54.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1441,1446 ****
|
||||||
|
--- 1441,1448 ----
|
||||||
|
enter_buffer(buf)
|
||||||
|
buf_T *buf;
|
||||||
|
{
|
||||||
|
+ long old_tw = curbuf->b_p_tw;
|
||||||
|
+
|
||||||
|
/* Copy buffer and window local option values. Not for a help buffer. */
|
||||||
|
buf_copy_options(buf, BCO_ENTER | BCO_NOHELP);
|
||||||
|
if (!buf->b_help)
|
||||||
|
***************
|
||||||
|
*** 1464,1469 ****
|
||||||
|
--- 1466,1473 ----
|
||||||
|
|
||||||
|
#ifdef FEAT_SYN_HL
|
||||||
|
curwin->w_s = &(buf->b_s);
|
||||||
|
+ if (old_tw != buf->b_p_tw)
|
||||||
|
+ check_colorcolumn(curwin);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Cursor on first line by default. */
|
||||||
|
*** ../vim-7.3.798/src/version.c 2013-01-31 21:09:10.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 11:55:06.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 799,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
I wonder, do vegetarians eat fruit bats?
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
64
7.3.800
Normal file
64
7.3.800
Normal file
@ -0,0 +1,64 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.800
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.800
|
||||||
|
Problem: The " mark is not adjusted when inserting lines. (Roland Eggner)
|
||||||
|
Solution: Adjust the line number. (Christian Brabandt)
|
||||||
|
Files: src/mark.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.799/src/mark.c 2013-01-23 15:53:08.000000000 +0100
|
||||||
|
--- src/mark.c 2013-02-06 12:29:46.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1047,1052 ****
|
||||||
|
--- 1047,1053 ----
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
|
tabpage_T *tab;
|
||||||
|
#endif
|
||||||
|
+ static pos_T initpos = INIT_POS_T(1, 0, 0);
|
||||||
|
|
||||||
|
if (line2 < line1 && amount_after == 0L) /* nothing to do */
|
||||||
|
return;
|
||||||
|
***************
|
||||||
|
*** 1072,1077 ****
|
||||||
|
--- 1073,1083 ----
|
||||||
|
/* last change position */
|
||||||
|
one_adjust(&(curbuf->b_last_change.lnum));
|
||||||
|
|
||||||
|
+ /* last cursor position, if it was set */
|
||||||
|
+ if (!equalpos(curbuf->b_last_cursor, initpos))
|
||||||
|
+ one_adjust(&(curbuf->b_last_cursor.lnum));
|
||||||
|
+
|
||||||
|
+
|
||||||
|
#ifdef FEAT_JUMPLIST
|
||||||
|
/* list of change positions */
|
||||||
|
for (i = 0; i < curbuf->b_changelistlen; ++i)
|
||||||
|
*** ../vim-7.3.799/src/version.c 2013-02-06 12:14:36.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 12:31:15.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 800,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
ARTHUR: What does it say?
|
||||||
|
BROTHER MAYNARD: It reads ... "Here may be found the last words of Joseph of
|
||||||
|
Aramathea." "He who is valorous and pure of heart may find
|
||||||
|
the Holy Grail in the aaaaarrrrrrggghhh..."
|
||||||
|
ARTHUR: What?
|
||||||
|
BROTHER MAYNARD: "The Aaaaarrrrrrggghhh..."
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
61
7.3.801
Normal file
61
7.3.801
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.801
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.801
|
||||||
|
Problem: ":window set nu?" displays the cursor line. (Nazri Ramliy)
|
||||||
|
Solution: Do not update the cursor line when conceallevel is zero or the
|
||||||
|
screen has scrolled. (partly by Christian Brabandt)
|
||||||
|
Files: src/window.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.800/src/window.c 2013-01-17 13:59:56.000000000 +0100
|
||||||
|
--- src/window.c 2013-02-06 13:28:10.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 3991,3999 ****
|
||||||
|
|
||||||
|
#ifdef FEAT_CONCEAL
|
||||||
|
/* Conceal cursor line in previous window, unconceal in current window. */
|
||||||
|
! if (win_valid(owp))
|
||||||
|
update_single_line(owp, owp->w_cursor.lnum);
|
||||||
|
! update_single_line(curwin, curwin->w_cursor.lnum);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
--- 3991,4000 ----
|
||||||
|
|
||||||
|
#ifdef FEAT_CONCEAL
|
||||||
|
/* Conceal cursor line in previous window, unconceal in current window. */
|
||||||
|
! if (win_valid(owp) && owp->w_p_cole > 0 && !msg_scrolled)
|
||||||
|
update_single_line(owp, owp->w_cursor.lnum);
|
||||||
|
! if (curwin->w_p_cole > 0 && !msg_scrolled)
|
||||||
|
! need_cursor_line_redraw = TRUE;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
*** ../vim-7.3.800/src/version.c 2013-02-06 12:33:15.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 13:32:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 801,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
ARTHUR: But if he was dying, he wouldn't bother to carve
|
||||||
|
"Aaaaarrrrrrggghhh". He'd just say it.
|
||||||
|
BROTHER MAYNARD: It's down there carved in stone.
|
||||||
|
GALAHAD: Perhaps he was dictating.
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
50
7.3.802
Normal file
50
7.3.802
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.802
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.802
|
||||||
|
Problem: After setting 'isk' to a value ending in a comma appending to the
|
||||||
|
option fails.
|
||||||
|
Solution: Disallow a trailing comma for 'isk' and similar options.
|
||||||
|
Files: src/charset.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.801/src/charset.c 2013-01-30 17:30:14.000000000 +0100
|
||||||
|
--- src/charset.c 2013-02-06 16:20:01.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 284,290 ****
|
||||||
|
--- 284,295 ----
|
||||||
|
}
|
||||||
|
++c;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ c = *p;
|
||||||
|
p = skip_to_option_part(p);
|
||||||
|
+ if (c == ',' && *p == NUL)
|
||||||
|
+ /* Trailing comma is not allowed. */
|
||||||
|
+ return FAIL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
chartab_initialized = TRUE;
|
||||||
|
*** ../vim-7.3.801/src/version.c 2013-02-06 13:37:58.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 16:21:18.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 802,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Dreams are free, but there's a small charge for alterations.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
106
7.3.803
Normal file
106
7.3.803
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.803
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.803 (after 7.3.792)
|
||||||
|
Problem: Substitute with confirmation and then "q" does not replace
|
||||||
|
anything. (John McGowan)
|
||||||
|
Solution: Do not break the loop, skip to the end.
|
||||||
|
Files: src/ex_cmds.c, src/testdir/test80.in, src/testdir/test80.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.802/src/ex_cmds.c 2013-01-30 21:55:45.000000000 +0100
|
||||||
|
--- src/ex_cmds.c 2013-02-06 18:13:52.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4878,4884 ****
|
||||||
|
goto skip;
|
||||||
|
}
|
||||||
|
if (got_quit)
|
||||||
|
! break;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Move the cursor to the start of the match, so that we can
|
||||||
|
--- 4878,4884 ----
|
||||||
|
goto skip;
|
||||||
|
}
|
||||||
|
if (got_quit)
|
||||||
|
! goto skip;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Move the cursor to the start of the match, so that we can
|
||||||
|
*** ../vim-7.3.802/src/testdir/test80.in 2013-01-30 17:03:25.000000000 +0100
|
||||||
|
--- src/testdir/test80.in 2013-02-06 18:21:07.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 153,164 ****
|
||||||
|
:s/\(^\|,\)\ze\(,\|Y\)/\1N/gc
|
||||||
|
a:$put =',,Z'
|
||||||
|
:s/\(^\|,\)\ze\(,\|Z\)/\1N/gc
|
||||||
|
! yy/^TEST_9
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
TEST_9:
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
:/^Results/,$wq! test.out
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
--- 153,175 ----
|
||||||
|
:s/\(^\|,\)\ze\(,\|Y\)/\1N/gc
|
||||||
|
a:$put =',,Z'
|
||||||
|
:s/\(^\|,\)\ze\(,\|Z\)/\1N/gc
|
||||||
|
! yy/^TEST_9:
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
TEST_9:
|
||||||
|
|
||||||
|
STARTTEST
|
||||||
|
+ :set magic&
|
||||||
|
+ :set cpo&
|
||||||
|
+ :$put =\"\n\nTEST_9:\"
|
||||||
|
+ :$put ='xxx'
|
||||||
|
+ :s/x/X/gc
|
||||||
|
+ yyq/^TEST_10:
|
||||||
|
+ ENDTEST
|
||||||
|
+
|
||||||
|
+ TEST_10:
|
||||||
|
+
|
||||||
|
+ STARTTEST
|
||||||
|
:/^Results/,$wq! test.out
|
||||||
|
ENDTEST
|
||||||
|
|
||||||
|
*** ../vim-7.3.802/src/testdir/test80.ok 2013-01-30 17:03:25.000000000 +0100
|
||||||
|
--- src/testdir/test80.ok 2013-02-06 18:21:16.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 105,107 ****
|
||||||
|
--- 105,111 ----
|
||||||
|
N,,NX
|
||||||
|
N,,NY
|
||||||
|
N,,NZ
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ TEST_9:
|
||||||
|
+ XXx
|
||||||
|
*** ../vim-7.3.802/src/version.c 2013-02-06 16:26:20.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 18:14:42.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 803,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
To the optimist, the glass is half full.
|
||||||
|
To the pessimist, the glass is half empty.
|
||||||
|
To the engineer, the glass is twice as big as it needs to be.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
46
7.3.804
Normal file
46
7.3.804
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.804
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.804 (after 7.3.799)
|
||||||
|
Problem: Compiler warning for tiny build. (Tony Mechelynck)
|
||||||
|
Solution: Add #ifdefs around variable.
|
||||||
|
Files: src/buffer.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.803/src/buffer.c 2013-02-06 12:14:36.000000000 +0100
|
||||||
|
--- src/buffer.c 2013-02-06 18:42:05.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1441,1447 ****
|
||||||
|
--- 1441,1449 ----
|
||||||
|
enter_buffer(buf)
|
||||||
|
buf_T *buf;
|
||||||
|
{
|
||||||
|
+ #ifdef FEAT_SYN_HL
|
||||||
|
long old_tw = curbuf->b_p_tw;
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
/* Copy buffer and window local option values. Not for a help buffer. */
|
||||||
|
buf_copy_options(buf, BCO_ENTER | BCO_NOHELP);
|
||||||
|
*** ../vim-7.3.803/src/version.c 2013-02-06 18:23:58.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 18:42:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 804,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Sorry, no fortune today.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
99
7.3.805
Normal file
99
7.3.805
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.805
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.805
|
||||||
|
Problem: Lua version 5.2 is not detected properly on Arch Linux.
|
||||||
|
Solution: Adjust autoconf. (lilydjwg)
|
||||||
|
Files: src/configure.in, src/auto/configure
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.804/src/configure.in 2013-01-30 14:55:34.000000000 +0100
|
||||||
|
--- src/configure.in 2013-02-06 19:22:17.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 496,508 ****
|
||||||
|
else
|
||||||
|
dnl Determine the SONAME for the current version, but fallback to
|
||||||
|
dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
|
||||||
|
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
||||||
|
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
|
||||||
|
! LUA_SONAME=".$i"
|
||||||
|
! break
|
||||||
|
! fi
|
||||||
|
done
|
||||||
|
- vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
|
||||||
|
fi
|
||||||
|
AC_DEFINE(DYNAMIC_LUA)
|
||||||
|
LUA_LIBS=""
|
||||||
|
--- 496,510 ----
|
||||||
|
else
|
||||||
|
dnl Determine the SONAME for the current version, but fallback to
|
||||||
|
dnl liblua${vi_cv_version_lua}.so if no SONAME-versioned file is found.
|
||||||
|
! for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
|
||||||
|
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
||||||
|
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
|
||||||
|
! LUA_SONAME=".$i"
|
||||||
|
! break
|
||||||
|
! fi
|
||||||
|
! done
|
||||||
|
! vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
AC_DEFINE(DYNAMIC_LUA)
|
||||||
|
LUA_LIBS=""
|
||||||
|
*** ../vim-7.3.804/src/auto/configure 2013-01-30 14:55:34.000000000 +0100
|
||||||
|
--- src/auto/configure 2013-02-06 19:24:11.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4737,4749 ****
|
||||||
|
if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
|
||||||
|
vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
|
||||||
|
else
|
||||||
|
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
||||||
|
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${vi_cv_version_lua}.so.$i"; then
|
||||||
|
! LUA_SONAME=".$i"
|
||||||
|
! break
|
||||||
|
! fi
|
||||||
|
done
|
||||||
|
- vi_cv_dll_name_lua="liblua${vi_cv_version_lua}.so$LUA_SONAME"
|
||||||
|
fi
|
||||||
|
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
|
||||||
|
|
||||||
|
--- 4737,4751 ----
|
||||||
|
if test -f "${vi_cv_path_lua_pfx}/bin/cyglua-${vi_cv_version_lua}.dll"; then
|
||||||
|
vi_cv_dll_name_lua="cyglua-${vi_cv_version_lua}.dll"
|
||||||
|
else
|
||||||
|
! for LUA_SOVER in "${vi_cv_version_lua}.so" ".so.${vi_cv_version_lua}"; do
|
||||||
|
! for i in 0 1 2 3 4 5 6 7 8 9; do
|
||||||
|
! if test -f "${vi_cv_path_lua_pfx}/lib/liblua${LUA_SOVER}.$i"; then
|
||||||
|
! LUA_SONAME=".$i"
|
||||||
|
! break
|
||||||
|
! fi
|
||||||
|
! done
|
||||||
|
! vi_cv_dll_name_lua="liblua${LUA_SOVER}$LUA_SONAME"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
$as_echo "#define DYNAMIC_LUA 1" >>confdefs.h
|
||||||
|
|
||||||
|
*** ../vim-7.3.804/src/version.c 2013-02-06 18:44:57.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 19:26:37.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 805,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Permission is granted to read this message out aloud on Kings Cross Road,
|
||||||
|
London, under the condition that the orator is properly dressed.
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
171
7.3.806
Normal file
171
7.3.806
Normal file
@ -0,0 +1,171 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.806
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.806
|
||||||
|
Problem: Compiler warnings in Perl code when building with Visual studio
|
||||||
|
2012. (skeept)
|
||||||
|
Solution: Add type casts. (Christian Brabandt, 2013 Jan 30)
|
||||||
|
Files: src/if_perl.xs
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.805/src/if_perl.xs 2012-09-21 12:50:44.000000000 +0200
|
||||||
|
--- src/if_perl.xs 2013-02-06 19:55:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 1048,1054 ****
|
||||||
|
{
|
||||||
|
SV *sv = ST(i);
|
||||||
|
if (SvIOK(sv))
|
||||||
|
! b = SvIV(ST(i));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char_u *pat;
|
||||||
|
--- 1048,1054 ----
|
||||||
|
{
|
||||||
|
SV *sv = ST(i);
|
||||||
|
if (SvIOK(sv))
|
||||||
|
! b = (int) SvIV(ST(i));
|
||||||
|
else
|
||||||
|
{
|
||||||
|
char_u *pat;
|
||||||
|
***************
|
||||||
|
*** 1091,1097 ****
|
||||||
|
{
|
||||||
|
for (i = 0; i < items; i++)
|
||||||
|
{
|
||||||
|
! w = SvIV(ST(i));
|
||||||
|
vimwin = win_find_nr(w);
|
||||||
|
if (vimwin)
|
||||||
|
XPUSHs(newWINrv(newSV(0), vimwin));
|
||||||
|
--- 1091,1097 ----
|
||||||
|
{
|
||||||
|
for (i = 0; i < items; i++)
|
||||||
|
{
|
||||||
|
! w = (int) SvIV(ST(i));
|
||||||
|
vimwin = win_find_nr(w);
|
||||||
|
if (vimwin)
|
||||||
|
XPUSHs(newWINrv(newSV(0), vimwin));
|
||||||
|
***************
|
||||||
|
*** 1154,1161 ****
|
||||||
|
|
||||||
|
if (!win_valid(win))
|
||||||
|
win = curwin;
|
||||||
|
! lnum = SvIV(ST(1));
|
||||||
|
! col = SvIV(ST(2));
|
||||||
|
win->w_cursor.lnum = lnum;
|
||||||
|
win->w_cursor.col = col;
|
||||||
|
check_cursor(); /* put cursor on an existing line */
|
||||||
|
--- 1154,1161 ----
|
||||||
|
|
||||||
|
if (!win_valid(win))
|
||||||
|
win = curwin;
|
||||||
|
! lnum = (int) SvIV(ST(1));
|
||||||
|
! col = (int) SvIV(ST(2));
|
||||||
|
win->w_cursor.lnum = lnum;
|
||||||
|
win->w_cursor.col = col;
|
||||||
|
check_cursor(); /* put cursor on an existing line */
|
||||||
|
***************
|
||||||
|
*** 1216,1222 ****
|
||||||
|
{
|
||||||
|
for (i = 1; i < items; i++)
|
||||||
|
{
|
||||||
|
! lnum = SvIV(ST(i));
|
||||||
|
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
|
||||||
|
{
|
||||||
|
line = ml_get_buf(vimbuf, lnum, FALSE);
|
||||||
|
--- 1216,1222 ----
|
||||||
|
{
|
||||||
|
for (i = 1; i < items; i++)
|
||||||
|
{
|
||||||
|
! lnum = (long) SvIV(ST(i));
|
||||||
|
if (lnum > 0 && lnum <= vimbuf->b_ml.ml_line_count)
|
||||||
|
{
|
||||||
|
line = ml_get_buf(vimbuf, lnum, FALSE);
|
||||||
|
***************
|
||||||
|
*** 1239,1245 ****
|
||||||
|
if (items < 3)
|
||||||
|
croak("Usage: VIBUF::Set(vimbuf, lnum, @lines)");
|
||||||
|
|
||||||
|
! lnum = SvIV(ST(1));
|
||||||
|
for(i = 2; i < items; i++, lnum++)
|
||||||
|
{
|
||||||
|
line = SvPV(ST(i),PL_na);
|
||||||
|
--- 1239,1245 ----
|
||||||
|
if (items < 3)
|
||||||
|
croak("Usage: VIBUF::Set(vimbuf, lnum, @lines)");
|
||||||
|
|
||||||
|
! lnum = (long) SvIV(ST(1));
|
||||||
|
for(i = 2; i < items; i++, lnum++)
|
||||||
|
{
|
||||||
|
line = SvPV(ST(i),PL_na);
|
||||||
|
***************
|
||||||
|
*** 1274,1286 ****
|
||||||
|
{
|
||||||
|
if (items == 2)
|
||||||
|
{
|
||||||
|
! lnum = SvIV(ST(1));
|
||||||
|
count = 1;
|
||||||
|
}
|
||||||
|
else if (items == 3)
|
||||||
|
{
|
||||||
|
! lnum = SvIV(ST(1));
|
||||||
|
! count = 1 + SvIV(ST(2)) - lnum;
|
||||||
|
if (count == 0)
|
||||||
|
count = 1;
|
||||||
|
if (count < 0)
|
||||||
|
--- 1274,1286 ----
|
||||||
|
{
|
||||||
|
if (items == 2)
|
||||||
|
{
|
||||||
|
! lnum = (long) SvIV(ST(1));
|
||||||
|
count = 1;
|
||||||
|
}
|
||||||
|
else if (items == 3)
|
||||||
|
{
|
||||||
|
! lnum = (long) SvIV(ST(1));
|
||||||
|
! count = (long) 1 + SvIV(ST(2)) - lnum;
|
||||||
|
if (count == 0)
|
||||||
|
count = 1;
|
||||||
|
if (count < 0)
|
||||||
|
***************
|
||||||
|
*** 1331,1337 ****
|
||||||
|
if (items < 3)
|
||||||
|
croak("Usage: VIBUF::Append(vimbuf, lnum, @lines)");
|
||||||
|
|
||||||
|
! lnum = SvIV(ST(1));
|
||||||
|
for (i = 2; i < items; i++, lnum++)
|
||||||
|
{
|
||||||
|
line = SvPV(ST(i),PL_na);
|
||||||
|
--- 1331,1337 ----
|
||||||
|
if (items < 3)
|
||||||
|
croak("Usage: VIBUF::Append(vimbuf, lnum, @lines)");
|
||||||
|
|
||||||
|
! lnum = (long) SvIV(ST(1));
|
||||||
|
for (i = 2; i < items; i++, lnum++)
|
||||||
|
{
|
||||||
|
line = SvPV(ST(i),PL_na);
|
||||||
|
*** ../vim-7.3.805/src/version.c 2013-02-06 19:49:38.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-06 19:58:16.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 806,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
BRIDGEKEEPER: What is your favorite colour?
|
||||||
|
LAUNCELOT: Blue.
|
||||||
|
BRIDGEKEEPER: Right. Off you go.
|
||||||
|
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
52
7.3.807
Normal file
52
7.3.807
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.807
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.807
|
||||||
|
Problem: Popup menu does not work properly with the preview window, folds
|
||||||
|
and 'cursorcolumn'.
|
||||||
|
Solution: Redraw the popup menu after redrawing windows. (Christian
|
||||||
|
Brabandt)
|
||||||
|
Files: src/screen.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.806/src/screen.c 2013-01-30 12:31:32.000000000 +0100
|
||||||
|
--- src/screen.c 2013-02-13 11:59:23.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 548,553 ****
|
||||||
|
--- 548,558 ----
|
||||||
|
#if defined(FEAT_SEARCH_EXTRA)
|
||||||
|
end_search_hl();
|
||||||
|
#endif
|
||||||
|
+ #ifdef FEAT_INS_EXPAND
|
||||||
|
+ /* May need to redraw the popup menu. */
|
||||||
|
+ if (pum_visible())
|
||||||
|
+ pum_redraw();
|
||||||
|
+ #endif
|
||||||
|
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
|
/* Reset b_mod_set flags. Going through all windows is probably faster
|
||||||
|
*** ../vim-7.3.806/src/version.c 2013-02-06 19:58:38.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-13 12:00:55.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 807,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
A special cleaning ordinance bans housewives from hiding dirt and dust under a
|
||||||
|
rug in a dwelling.
|
||||||
|
[real standing law in Pennsylvania, United States of America]
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
289
7.3.808
Normal file
289
7.3.808
Normal file
@ -0,0 +1,289 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.808
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.808
|
||||||
|
Problem: Python threads still do not work properly.
|
||||||
|
Solution: Fix both Python 2 and 3. Add tests. (Ken Takata)
|
||||||
|
Files: src/if_python.c, src/if_python3.c, src/testdir/test86.in,
|
||||||
|
src/testdir/test86.ok, src/testdir/test87.in,
|
||||||
|
src/testdir/test87.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.807/src/if_python.c 2013-01-30 11:44:33.000000000 +0100
|
||||||
|
--- src/if_python.c 2013-02-13 14:07:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 741,747 ****
|
||||||
|
PyMac_Initialize();
|
||||||
|
#endif
|
||||||
|
/* Initialise threads, and below save the state using
|
||||||
|
! * PyGILState_Ensure. Without the call to PyGILState_Ensure, thread
|
||||||
|
* specific state (such as the system trace hook), will be lost
|
||||||
|
* between invocations of Python code. */
|
||||||
|
PyEval_InitThreads();
|
||||||
|
--- 741,747 ----
|
||||||
|
PyMac_Initialize();
|
||||||
|
#endif
|
||||||
|
/* Initialise threads, and below save the state using
|
||||||
|
! * PyEval_SaveThread. Without the call to PyEval_SaveThread, thread
|
||||||
|
* specific state (such as the system trace hook), will be lost
|
||||||
|
* between invocations of Python code. */
|
||||||
|
PyEval_InitThreads();
|
||||||
|
***************
|
||||||
|
*** 755,764 ****
|
||||||
|
if (PythonMod_Init())
|
||||||
|
goto fail;
|
||||||
|
|
||||||
|
- /* The first python thread is vim's, release the lock. */
|
||||||
|
- Python_SaveThread();
|
||||||
|
- pygilstate = PyGILState_Ensure();
|
||||||
|
-
|
||||||
|
globals = PyModule_GetDict(PyImport_AddModule("__main__"));
|
||||||
|
|
||||||
|
/* Remove the element from sys.path that was added because of our
|
||||||
|
--- 755,760 ----
|
||||||
|
***************
|
||||||
|
*** 767,773 ****
|
||||||
|
* the current directory in sys.path. */
|
||||||
|
PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
|
||||||
|
|
||||||
|
! PyGILState_Release(pygilstate);
|
||||||
|
|
||||||
|
initialised = 1;
|
||||||
|
}
|
||||||
|
--- 763,776 ----
|
||||||
|
* the current directory in sys.path. */
|
||||||
|
PyRun_SimpleString("import sys; sys.path = filter(lambda x: x != '/must>not&exist', sys.path)");
|
||||||
|
|
||||||
|
! /* lock is created and acquired in PyEval_InitThreads() and thread
|
||||||
|
! * state is created in Py_Initialize()
|
||||||
|
! * there _PyGILState_NoteThreadState() also sets gilcounter to 1
|
||||||
|
! * (python must have threads enabled!)
|
||||||
|
! * so the following does both: unlock GIL and save thread state in TLS
|
||||||
|
! * without deleting thread state
|
||||||
|
! */
|
||||||
|
! PyEval_SaveThread();
|
||||||
|
|
||||||
|
initialised = 1;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.807/src/if_python3.c 2012-11-28 15:33:10.000000000 +0100
|
||||||
|
--- src/if_python3.c 2013-02-13 14:07:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 729,741 ****
|
||||||
|
#else
|
||||||
|
PyMac_Initialize();
|
||||||
|
#endif
|
||||||
|
! /* Initialise threads, and save the state using PyGILState_Ensure.
|
||||||
|
! * Without the call to PyGILState_Ensure, thread specific state (such
|
||||||
|
! * as the system trace hook), will be lost between invocations of
|
||||||
|
! * Python code. */
|
||||||
|
PyEval_InitThreads();
|
||||||
|
- pygilstate = PyGILState_Ensure();
|
||||||
|
-
|
||||||
|
#ifdef DYNAMIC_PYTHON3
|
||||||
|
get_py3_exceptions();
|
||||||
|
#endif
|
||||||
|
--- 729,739 ----
|
||||||
|
#else
|
||||||
|
PyMac_Initialize();
|
||||||
|
#endif
|
||||||
|
! /* Initialise threads, and below save the state using
|
||||||
|
! * PyEval_SaveThread. Without the call to PyEval_SaveThread, thread
|
||||||
|
! * specific state (such as the system trace hook), will be lost
|
||||||
|
! * between invocations of Python code. */
|
||||||
|
PyEval_InitThreads();
|
||||||
|
#ifdef DYNAMIC_PYTHON3
|
||||||
|
get_py3_exceptions();
|
||||||
|
#endif
|
||||||
|
***************
|
||||||
|
*** 754,766 ****
|
||||||
|
*/
|
||||||
|
PyRun_SimpleString("import vim; import sys; sys.path = list(filter(lambda x: not x.endswith('must>not&exist'), sys.path))");
|
||||||
|
|
||||||
|
! // lock is created and acquired in PyEval_InitThreads() and thread
|
||||||
|
! // state is created in Py_Initialize()
|
||||||
|
! // there _PyGILState_NoteThreadState() also sets gilcounter to 1
|
||||||
|
! // (python must have threads enabled!)
|
||||||
|
! // so the following does both: unlock GIL and save thread state in TLS
|
||||||
|
! // without deleting thread state
|
||||||
|
! PyGILState_Release(pygilstate);
|
||||||
|
|
||||||
|
py3initialised = 1;
|
||||||
|
}
|
||||||
|
--- 752,765 ----
|
||||||
|
*/
|
||||||
|
PyRun_SimpleString("import vim; import sys; sys.path = list(filter(lambda x: not x.endswith('must>not&exist'), sys.path))");
|
||||||
|
|
||||||
|
! /* lock is created and acquired in PyEval_InitThreads() and thread
|
||||||
|
! * state is created in Py_Initialize()
|
||||||
|
! * there _PyGILState_NoteThreadState() also sets gilcounter to 1
|
||||||
|
! * (python must have threads enabled!)
|
||||||
|
! * so the following does both: unlock GIL and save thread state in TLS
|
||||||
|
! * without deleting thread state
|
||||||
|
! */
|
||||||
|
! PyEval_SaveThread();
|
||||||
|
|
||||||
|
py3initialised = 1;
|
||||||
|
}
|
||||||
|
*** ../vim-7.3.807/src/testdir/test86.in 2012-09-21 14:00:05.000000000 +0200
|
||||||
|
--- src/testdir/test86.in 2013-02-13 13:58:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 267,272 ****
|
||||||
|
--- 267,320 ----
|
||||||
|
: $put =toput
|
||||||
|
: endtry
|
||||||
|
:endfor
|
||||||
|
+ :"
|
||||||
|
+ :" threading
|
||||||
|
+ :let l = [0]
|
||||||
|
+ :py l=vim.bindeval('l')
|
||||||
|
+ :py <<EOF
|
||||||
|
+ import threading
|
||||||
|
+ import time
|
||||||
|
+
|
||||||
|
+ class T(threading.Thread):
|
||||||
|
+ def __init__(self):
|
||||||
|
+ threading.Thread.__init__(self)
|
||||||
|
+ self.t = 0
|
||||||
|
+ self.running = True
|
||||||
|
+
|
||||||
|
+ def run(self):
|
||||||
|
+ while self.running:
|
||||||
|
+ self.t += 1
|
||||||
|
+ time.sleep(0.1)
|
||||||
|
+
|
||||||
|
+ t = T()
|
||||||
|
+ t.start()
|
||||||
|
+ EOF
|
||||||
|
+ :sleep 1
|
||||||
|
+ :py t.running = False
|
||||||
|
+ :py t.join()
|
||||||
|
+ :py l[0] = t.t > 8 # check if the background thread is working
|
||||||
|
+ :$put =string(l)
|
||||||
|
+ :"
|
||||||
|
+ :" settrace
|
||||||
|
+ :let l = []
|
||||||
|
+ :py l=vim.bindeval('l')
|
||||||
|
+ :py <<EOF
|
||||||
|
+ import sys
|
||||||
|
+
|
||||||
|
+ def traceit(frame, event, arg):
|
||||||
|
+ global l
|
||||||
|
+ if event == "line":
|
||||||
|
+ l.extend([frame.f_lineno])
|
||||||
|
+ return traceit
|
||||||
|
+
|
||||||
|
+ def trace_main():
|
||||||
|
+ for i in range(5):
|
||||||
|
+ pass
|
||||||
|
+ EOF
|
||||||
|
+ :py sys.settrace(traceit)
|
||||||
|
+ :py trace_main()
|
||||||
|
+ :py sys.settrace(None)
|
||||||
|
+ :$put =string(l)
|
||||||
|
:endfun
|
||||||
|
:"
|
||||||
|
:call Test()
|
||||||
|
*** ../vim-7.3.807/src/testdir/test86.ok 2012-09-21 14:00:05.000000000 +0200
|
||||||
|
--- src/testdir/test86.ok 2013-02-13 13:58:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 63,65 ****
|
||||||
|
--- 63,67 ----
|
||||||
|
{"\0": 1}: Vim(let):E859:
|
||||||
|
undefined_name: Vim(let):E858:
|
||||||
|
vim: Vim(let):E859:
|
||||||
|
+ [1]
|
||||||
|
+ [1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1]
|
||||||
|
*** ../vim-7.3.807/src/testdir/test87.in 2012-09-21 14:00:05.000000000 +0200
|
||||||
|
--- src/testdir/test87.in 2013-02-13 13:58:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 267,272 ****
|
||||||
|
--- 267,320 ----
|
||||||
|
: $put =toput
|
||||||
|
: endtry
|
||||||
|
:endfor
|
||||||
|
+ :"
|
||||||
|
+ :" threading
|
||||||
|
+ :let l = [0]
|
||||||
|
+ :py3 l=vim.bindeval('l')
|
||||||
|
+ :py3 <<EOF
|
||||||
|
+ import threading
|
||||||
|
+ import time
|
||||||
|
+
|
||||||
|
+ class T(threading.Thread):
|
||||||
|
+ def __init__(self):
|
||||||
|
+ threading.Thread.__init__(self)
|
||||||
|
+ self.t = 0
|
||||||
|
+ self.running = True
|
||||||
|
+
|
||||||
|
+ def run(self):
|
||||||
|
+ while self.running:
|
||||||
|
+ self.t += 1
|
||||||
|
+ time.sleep(0.1)
|
||||||
|
+
|
||||||
|
+ t = T()
|
||||||
|
+ t.start()
|
||||||
|
+ EOF
|
||||||
|
+ :sleep 1
|
||||||
|
+ :py3 t.running = False
|
||||||
|
+ :py3 t.join()
|
||||||
|
+ :py3 l[0] = t.t > 8 # check if the background thread is working
|
||||||
|
+ :$put =string(l)
|
||||||
|
+ :"
|
||||||
|
+ :" settrace
|
||||||
|
+ :let l = []
|
||||||
|
+ :py3 l=vim.bindeval('l')
|
||||||
|
+ :py3 <<EOF
|
||||||
|
+ import sys
|
||||||
|
+
|
||||||
|
+ def traceit(frame, event, arg):
|
||||||
|
+ global l
|
||||||
|
+ if event == "line":
|
||||||
|
+ l += [frame.f_lineno]
|
||||||
|
+ return traceit
|
||||||
|
+
|
||||||
|
+ def trace_main():
|
||||||
|
+ for i in range(5):
|
||||||
|
+ pass
|
||||||
|
+ EOF
|
||||||
|
+ :py3 sys.settrace(traceit)
|
||||||
|
+ :py3 trace_main()
|
||||||
|
+ :py3 sys.settrace(None)
|
||||||
|
+ :$put =string(l)
|
||||||
|
:endfun
|
||||||
|
:"
|
||||||
|
:call Test()
|
||||||
|
*** ../vim-7.3.807/src/testdir/test87.ok 2012-09-21 14:00:05.000000000 +0200
|
||||||
|
--- src/testdir/test87.ok 2013-02-13 13:58:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 63,65 ****
|
||||||
|
--- 63,67 ----
|
||||||
|
{"\0": 1}: Vim(let):E861:
|
||||||
|
undefined_name: Vim(let):E860:
|
||||||
|
vim: Vim(let):E861:
|
||||||
|
+ [1]
|
||||||
|
+ [1, 10, 11, 10, 11, 10, 11, 10, 11, 10, 11, 10, 1]
|
||||||
|
*** ../vim-7.3.807/src/version.c 2013-02-13 12:15:59.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-13 14:10:53.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 808,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
Lawmakers made it obligatory for everybody to take at least one bath
|
||||||
|
each week -- on Saturday night.
|
||||||
|
[real standing law in Vermont, United States of America]
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
52
7.3.809
Normal file
52
7.3.809
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.809
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.809
|
||||||
|
Problem: The dosinst.c program has a buffer overflow. (Thomas Gwae)
|
||||||
|
Solution: Ignore $VIMRUNTIME if it is too long.
|
||||||
|
Files: src/dosinst.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.808/src/dosinst.c 2010-08-15 21:57:28.000000000 +0200
|
||||||
|
--- src/dosinst.c 2013-02-13 14:34:25.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 375,381 ****
|
||||||
|
|
||||||
|
/* First get $VIMRUNTIME. If it's set, remove the tail. */
|
||||||
|
vim = getenv("VIMRUNTIME");
|
||||||
|
! if (vim != NULL && *vim != 0)
|
||||||
|
{
|
||||||
|
strcpy(buf, vim);
|
||||||
|
remove_tail(buf);
|
||||||
|
--- 375,381 ----
|
||||||
|
|
||||||
|
/* First get $VIMRUNTIME. If it's set, remove the tail. */
|
||||||
|
vim = getenv("VIMRUNTIME");
|
||||||
|
! if (vim != NULL && *vim != 0 && strlen(vim) < BUFSIZE)
|
||||||
|
{
|
||||||
|
strcpy(buf, vim);
|
||||||
|
remove_tail(buf);
|
||||||
|
*** ../vim-7.3.808/src/version.c 2013-02-13 14:17:00.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-13 14:36:33.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 809,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
"I know that there are people who don't love their fellow man,
|
||||||
|
and I hate those people!" - Tom Lehrer
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
259
7.3.810
Normal file
259
7.3.810
Normal file
@ -0,0 +1,259 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.810
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.810
|
||||||
|
Problem: 'relativenumber is reset unexpectedly. (François Ingelrest)
|
||||||
|
Solution: After an option was reset also reset the global value. Add a test.
|
||||||
|
(Christian Brabandt)
|
||||||
|
Files: src/option.c, src/testdir/Make_amiga.mak,
|
||||||
|
src/testdir/Make_dos.mak, src/testdir/Make_ming.mak,
|
||||||
|
src/testdir/Make_os2.mak, src/testdir/Make_vms.mms,
|
||||||
|
src/testdir/Makefile, src/testdir/test89.in,
|
||||||
|
src/testdir/test89.ok
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.809/src/option.c 2013-01-17 17:37:31.000000000 +0100
|
||||||
|
--- src/option.c 2013-02-13 15:40:12.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 7109,7115 ****
|
||||||
|
return errmsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
! #ifdef FEAT_SYN_HL
|
||||||
|
/*
|
||||||
|
* Simple int comparison function for use with qsort()
|
||||||
|
*/
|
||||||
|
--- 7109,7115 ----
|
||||||
|
return errmsg;
|
||||||
|
}
|
||||||
|
|
||||||
|
! #if defined(FEAT_SYN_HL) || defined(PROTO)
|
||||||
|
/*
|
||||||
|
* Simple int comparison function for use with qsort()
|
||||||
|
*/
|
||||||
|
***************
|
||||||
|
*** 7630,7646 ****
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! /* 'list', 'number' */
|
||||||
|
! else if ((int *)varp == &curwin->w_p_list
|
||||||
|
! || (int *)varp == &curwin->w_p_nu
|
||||||
|
|| (int *)varp == &curwin->w_p_rnu)
|
||||||
|
{
|
||||||
|
/* If 'number' is set, reset 'relativenumber'. */
|
||||||
|
/* If 'relativenumber' is set, reset 'number'. */
|
||||||
|
if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
|
||||||
|
curwin->w_p_rnu = FALSE;
|
||||||
|
if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu)
|
||||||
|
curwin->w_p_nu = FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if ((int *)varp == &curbuf->b_p_ro)
|
||||||
|
--- 7630,7651 ----
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
! /* 'number', 'relativenumber' */
|
||||||
|
! else if ((int *)varp == &curwin->w_p_nu
|
||||||
|
|| (int *)varp == &curwin->w_p_rnu)
|
||||||
|
{
|
||||||
|
/* If 'number' is set, reset 'relativenumber'. */
|
||||||
|
/* If 'relativenumber' is set, reset 'number'. */
|
||||||
|
if ((int *)varp == &curwin->w_p_nu && curwin->w_p_nu)
|
||||||
|
+ {
|
||||||
|
curwin->w_p_rnu = FALSE;
|
||||||
|
+ curwin->w_allbuf_opt.wo_rnu = FALSE;
|
||||||
|
+ }
|
||||||
|
if ((int *)varp == &curwin->w_p_rnu && curwin->w_p_rnu)
|
||||||
|
+ {
|
||||||
|
curwin->w_p_nu = FALSE;
|
||||||
|
+ curwin->w_allbuf_opt.wo_nu = FALSE;
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
else if ((int *)varp == &curbuf->b_p_ro)
|
||||||
|
*** ../vim-7.3.809/src/testdir/Make_amiga.mak 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/testdir/Make_amiga.mak 2013-02-13 15:01:32.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 31,37 ****
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out test88.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
--- 31,38 ----
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out test88.out \
|
||||||
|
! test89.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
***************
|
||||||
|
*** 136,138 ****
|
||||||
|
--- 137,140 ----
|
||||||
|
test83.out: test83.in
|
||||||
|
test84.out: test84.in
|
||||||
|
test88.out: test88.in
|
||||||
|
+ test89.out: test89.in
|
||||||
|
*** ../vim-7.3.809/src/testdir/Make_dos.mak 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/testdir/Make_dos.mak 2013-02-13 15:00:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 30,36 ****
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
--- 30,37 ----
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out \
|
||||||
|
! test89.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
*** ../vim-7.3.809/src/testdir/Make_ming.mak 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/testdir/Make_ming.mak 2013-02-13 15:01:16.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 50,56 ****
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
--- 50,57 ----
|
||||||
|
test68.out test69.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out \
|
||||||
|
! test89.out
|
||||||
|
|
||||||
|
SCRIPTS32 = test50.out test70.out
|
||||||
|
|
||||||
|
*** ../vim-7.3.809/src/testdir/Make_os2.mak 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/testdir/Make_os2.mak 2013-02-13 15:00:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 31,37 ****
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out test88.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
--- 31,38 ----
|
||||||
|
test66.out test67.out test68.out test69.out test70.out \
|
||||||
|
test71.out test72.out test73.out test74.out test75.out \
|
||||||
|
test76.out test77.out test78.out test79.out test80.out \
|
||||||
|
! test81.out test82.out test83.out test84.out test88.out \
|
||||||
|
! test89.out
|
||||||
|
|
||||||
|
.SUFFIXES: .in .out
|
||||||
|
|
||||||
|
*** ../vim-7.3.809/src/testdir/Make_vms.mms 2012-12-05 16:10:21.000000000 +0100
|
||||||
|
--- src/testdir/Make_vms.mms 2013-02-13 15:00:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 76,82 ****
|
||||||
|
test66.out test67.out test68.out test69.out \
|
||||||
|
test71.out test72.out test74.out test75.out test76.out \
|
||||||
|
test77.out test78.out test79.out test80.out test81.out \
|
||||||
|
! test82.out test83.out test84.out test88.out
|
||||||
|
|
||||||
|
# Known problems:
|
||||||
|
# Test 30: a problem around mac format - unknown reason
|
||||||
|
--- 76,82 ----
|
||||||
|
test66.out test67.out test68.out test69.out \
|
||||||
|
test71.out test72.out test74.out test75.out test76.out \
|
||||||
|
test77.out test78.out test79.out test80.out test81.out \
|
||||||
|
! test82.out test83.out test84.out test88.out test89.out
|
||||||
|
|
||||||
|
# Known problems:
|
||||||
|
# Test 30: a problem around mac format - unknown reason
|
||||||
|
*** ../vim-7.3.809/src/testdir/Makefile 2012-12-05 18:21:28.000000000 +0100
|
||||||
|
--- src/testdir/Makefile 2013-02-13 15:00:59.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 27,33 ****
|
||||||
|
test69.out test70.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out
|
||||||
|
|
||||||
|
SCRIPTS_GUI = test16.out
|
||||||
|
|
||||||
|
--- 27,34 ----
|
||||||
|
test69.out test70.out test71.out test72.out test73.out \
|
||||||
|
test74.out test75.out test76.out test77.out test78.out \
|
||||||
|
test79.out test80.out test81.out test82.out test83.out \
|
||||||
|
! test84.out test85.out test86.out test87.out test88.out \
|
||||||
|
! test89.out
|
||||||
|
|
||||||
|
SCRIPTS_GUI = test16.out
|
||||||
|
|
||||||
|
*** ../vim-7.3.809/src/testdir/test89.in 2013-02-13 15:43:44.000000000 +0100
|
||||||
|
--- src/testdir/test89.in 2013-02-13 15:07:28.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 0 ****
|
||||||
|
--- 1,15 ----
|
||||||
|
+ Some tests for setting 'number' and 'relativenumber'
|
||||||
|
+
|
||||||
|
+ STARTTEST
|
||||||
|
+ :set hidden nocp nu rnu
|
||||||
|
+ :redir @a | set nu? rnu? | redir END
|
||||||
|
+ :e! xx
|
||||||
|
+ :redir @b | set nu? rnu? | redir END
|
||||||
|
+ :e! #
|
||||||
|
+ :$put ='results:'
|
||||||
|
+ :$put a
|
||||||
|
+ :$put b
|
||||||
|
+ :/^results/,$w! test.out
|
||||||
|
+ :q!
|
||||||
|
+ ENDTEST
|
||||||
|
+
|
||||||
|
*** ../vim-7.3.809/src/testdir/test89.ok 2013-02-13 15:43:44.000000000 +0100
|
||||||
|
--- src/testdir/test89.ok 2013-02-13 15:08:05.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 0 ****
|
||||||
|
--- 1,7 ----
|
||||||
|
+ results:
|
||||||
|
+
|
||||||
|
+ nonumber
|
||||||
|
+ relativenumber
|
||||||
|
+
|
||||||
|
+ nonumber
|
||||||
|
+ relativenumber
|
||||||
|
*** ../vim-7.3.809/src/version.c 2013-02-13 14:36:39.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-13 15:42:18.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 810,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
A law to reduce crime states: "It is mandatory for a motorist with criminal
|
||||||
|
intentions to stop at the city limits and telephone the chief of police as he
|
||||||
|
is entering the town.
|
||||||
|
[real standing law in Washington, United States of America]
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
53
7.3.811
Normal file
53
7.3.811
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
To: vim_dev@googlegroups.com
|
||||||
|
Subject: Patch 7.3.811
|
||||||
|
Fcc: outbox
|
||||||
|
From: Bram Moolenaar <Bram@moolenaar.net>
|
||||||
|
Mime-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
------------
|
||||||
|
|
||||||
|
Patch 7.3.811
|
||||||
|
Problem: Useless termresponse parsing for SGR mouse.
|
||||||
|
Solution: Skip the parsing. (Hayaki Saito)
|
||||||
|
Files: src/term.c
|
||||||
|
|
||||||
|
|
||||||
|
*** ../vim-7.3.810/src/term.c 2012-12-05 14:42:56.000000000 +0100
|
||||||
|
--- src/term.c 2013-02-13 15:49:24.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 4045,4052 ****
|
||||||
|
#ifdef FEAT_TERMRESPONSE
|
||||||
|
if (key_name[0] == NUL
|
||||||
|
/* URXVT mouse uses <ESC>[#;#;#M, but we are matching <ESC>[ */
|
||||||
|
! || key_name[0] == KS_URXVT_MOUSE
|
||||||
|
! || key_name[0] == KS_SGR_MOUSE)
|
||||||
|
{
|
||||||
|
/* Check for xterm version string: "<Esc>[>{x};{vers};{y}c". Also
|
||||||
|
* eat other possible responses to t_RV, rxvt returns
|
||||||
|
--- 4045,4051 ----
|
||||||
|
#ifdef FEAT_TERMRESPONSE
|
||||||
|
if (key_name[0] == NUL
|
||||||
|
/* URXVT mouse uses <ESC>[#;#;#M, but we are matching <ESC>[ */
|
||||||
|
! || key_name[0] == KS_URXVT_MOUSE)
|
||||||
|
{
|
||||||
|
/* Check for xterm version string: "<Esc>[>{x};{vers};{y}c". Also
|
||||||
|
* eat other possible responses to t_RV, rxvt returns
|
||||||
|
*** ../vim-7.3.810/src/version.c 2013-02-13 15:44:22.000000000 +0100
|
||||||
|
--- src/version.c 2013-02-13 15:50:27.000000000 +0100
|
||||||
|
***************
|
||||||
|
*** 727,728 ****
|
||||||
|
--- 727,730 ----
|
||||||
|
{ /* Add new patch number below this line */
|
||||||
|
+ /**/
|
||||||
|
+ 811,
|
||||||
|
/**/
|
||||||
|
|
||||||
|
--
|
||||||
|
No children may attend school with their breath smelling of "wild onions."
|
||||||
|
[real standing law in West Virginia, United States of America]
|
||||||
|
|
||||||
|
/// 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 ///
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user