r1149 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.222 upstream/patches/7.1.223 upstream/patches/7.1.224 upstream/patches/7.1.225 upstream/patches/7.1.226 upstream/patches/7.1.227 upstream/patches/7.1.228
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Mon Jan 14 18:19:11 UTC 2008
Author: jamessan
Date: Mon Jan 14 18:19:11 2008
New Revision: 1149
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1149
Log:
Upstream patches 222 - 228
Added:
trunk/packages/vim/upstream/patches/7.1.222
trunk/packages/vim/upstream/patches/7.1.223
trunk/packages/vim/upstream/patches/7.1.224
trunk/packages/vim/upstream/patches/7.1.225
trunk/packages/vim/upstream/patches/7.1.226
trunk/packages/vim/upstream/patches/7.1.227
trunk/packages/vim/upstream/patches/7.1.228
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1149&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Jan 14 18:19:11 2008
@@ -252,3 +252,10 @@
12134 7.1.219 (after 7.1.215) synstack() doesn't work for one char region
3928 7.1.220 cursor may end up on trail byte after ")"
1978 7.1.221 when inserting a "(" the following highlighting may be wrong
+ 3531 7.1.222 (after 7.1.217) wildcards of ":helptags" are not expanded
+ 8138 7.1.223 glob() doesn't handle "'" when 'shell' is "sh" or "bash"
+ 2131 7.1.224 "vim -F -o one two" sets 'rightleft' in one window only
+ 1767 7.1.225 using unitialized value when XGetWMNormalHints() fails
+ 1957 7.1.226 command line completion fails for a file name with a '&' char
+ 5595 7.1.227 hang in syntax HL when moving over a ")"
+ 1678 7.1.228 with 'foldmethod' "indent" fold can't be closed after "3>>"
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1149&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Jan 14 18:19:11 2008
@@ -1,7 +1,7 @@
-vim (1:7.1-221+1) UNRELEASED; urgency=low
+vim (1:7.1-228+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (176 - 221), see README.gz for details.
+ * New upstream patches (176 - 228), see README.gz for details.
[ James Vega ]
* Add configure-tcl_detection.diff, which allows Vim's configure script to
@@ -17,7 +17,7 @@
* runtime/syntax/debcontrol.vim: Add s390x, sh3, sh3eb, sh4, sh4eb to the
list of recognized architectures. (Closes: #455993)
- -- James Vega <jamessan at debian.org> Mon, 14 Jan 2008 13:17:25 -0500
+ -- James Vega <jamessan at debian.org> Mon, 14 Jan 2008 13:18:42 -0500
vim (1:7.1-175+2) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.1.222
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.222?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.222 (added)
+++ trunk/packages/vim/upstream/patches/7.1.222 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,135 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.222
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.222 (after 7.1.217)
+Problem: Wildcards in argument of ":helptags" are not expanded. (Marcel
+ Svitalsky)
+Solution: Expand wildcards in the directory name.
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.221/src/ex_cmds.c Fri Jan 11 21:00:49 2008
+--- src/ex_cmds.c Sat Jan 12 21:40:51 2008
+***************
+*** 6106,6111 ****
+--- 6106,6113 ----
+ #ifdef FEAT_MULTI_LANG
+ char_u lang[2];
+ #endif
++ expand_T xpc;
++ char_u *dirname;
+ char_u ext[5];
+ char_u fname[8];
+ int filecount;
+***************
+*** 6119,6125 ****
+ eap->arg = skipwhite(eap->arg + 3);
+ }
+
+! if (!mch_isdir(eap->arg))
+ {
+ EMSG2(_("E150: Not a directory: %s"), eap->arg);
+ return;
+--- 6121,6131 ----
+ eap->arg = skipwhite(eap->arg + 3);
+ }
+
+! ExpandInit(&xpc);
+! xpc.xp_context = EXPAND_DIRECTORIES;
+! dirname = ExpandOne(&xpc, eap->arg, NULL,
+! WILD_LIST_NOTFOUND|WILD_SILENT, WILD_EXPAND_FREE);
+! if (dirname == NULL || !mch_isdir(dirname))
+ {
+ EMSG2(_("E150: Not a directory: %s"), eap->arg);
+ return;
+***************
+*** 6127,6133 ****
+
+ #ifdef FEAT_MULTI_LANG
+ /* Get a list of all files in the directory. */
+! STRCPY(NameBuff, eap->arg);
+ add_pathsep(NameBuff);
+ STRCAT(NameBuff, "*");
+ if (gen_expand_wildcards(1, &NameBuff, &filecount, &files,
+--- 6133,6139 ----
+
+ #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,
+***************
+*** 6135,6140 ****
+--- 6141,6147 ----
+ || filecount == 0)
+ {
+ EMSG2("E151: No match: %s", NameBuff);
++ vim_free(dirname);
+ return;
+ }
+
+***************
+*** 6200,6206 ****
+ ext[1] = fname[5];
+ ext[2] = fname[6];
+ }
+! helptags_one(eap->arg, ext, fname, add_help_tags);
+ }
+
+ ga_clear(&ga);
+--- 6207,6213 ----
+ ext[1] = fname[5];
+ ext[2] = fname[6];
+ }
+! helptags_one(dirname, ext, fname, add_help_tags);
+ }
+
+ ga_clear(&ga);
+***************
+*** 6208,6215 ****
+
+ #else
+ /* No language support, just use "*.txt" and "tags". */
+! helptags_one(eap->arg, (char_u *)".txt", (char_u *)"tags", add_help_tags);
+ #endif
+ }
+
+ static void
+--- 6215,6223 ----
+
+ #else
+ /* No language support, just use "*.txt" and "tags". */
+! helptags_one(dirname, (char_u *)".txt", (char_u *)"tags", add_help_tags);
+ #endif
++ vim_free(dirname);
+ }
+
+ static void
+*** ../vim-7.1.221/src/version.c Sat Jan 12 18:13:05 2008
+--- src/version.c Sun Jan 13 13:27:04 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 222,
+ /**/
+
+--
+ Arthur pulls Pin out. The MONK blesses the grenade as ...
+ARTHUR: (quietly) One, two, five ...
+GALAHAD: Three, sir!
+ARTHUR: Three.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.223
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.223?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.223 (added)
+++ trunk/packages/vim/upstream/patches/7.1.223 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,263 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.223
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.223
+Problem: glob() doesn't work properly when 'shell' is "sh" or "bash" and
+ the expanded name contains spaces, '~', single quotes and other
+ special characters. (Adri Verhoef, Charles Campbell)
+Solution: For Posix shells define a vimglob() function to list the matches
+ instead of using "echo" directly.
+Files: src/os_unix.c
+
+
+*** ../vim-7.1.222/src/os_unix.c Thu Jan 3 18:55:21 2008
+--- src/os_unix.c Sun Jan 13 13:52:53 2008
+***************
+*** 4946,4951 ****
+--- 4946,4954 ----
+ char_u *p;
+ int dir;
+ #ifdef __EMX__
++ /*
++ * This is the OS/2 implementation.
++ */
+ # define EXPL_ALLOC_INC 16
+ char_u **expl_files;
+ size_t files_alloced, files_free;
+***************
+*** 5056,5075 ****
+ return OK;
+
+ #else /* __EMX__ */
+!
+ int j;
+ char_u *tempname;
+ char_u *command;
+ FILE *fd;
+ char_u *buffer;
+! #define STYLE_ECHO 0 /* use "echo" to expand */
+! #define STYLE_GLOB 1 /* use "glob" to expand, for csh */
+! #define STYLE_PRINT 2 /* use "print -N" to expand, for zsh */
+! #define STYLE_BT 3 /* `cmd` expansion, execute the pattern directly */
+ int shell_style = STYLE_ECHO;
+ int check_spaces;
+ static int did_find_nul = FALSE;
+ int ampersent = FALSE;
+
+ *num_file = 0; /* default: no files found */
+ *file = NULL;
+--- 5059,5084 ----
+ return OK;
+
+ #else /* __EMX__ */
+! /*
+! * This is the non-OS/2 implementation (really Unix).
+! */
+ int j;
+ char_u *tempname;
+ char_u *command;
+ FILE *fd;
+ char_u *buffer;
+! #define STYLE_ECHO 0 /* use "echo", the default */
+! #define STYLE_GLOB 1 /* use "glob", for csh */
+! #define STYLE_VIMGLOB 2 /* use "vimglob", for Posix sh */
+! #define STYLE_PRINT 3 /* use "print -N", for zsh */
+! #define STYLE_BT 4 /* `cmd` expansion, execute the pattern
+! * directly */
+ int shell_style = STYLE_ECHO;
+ int check_spaces;
+ static int did_find_nul = FALSE;
+ int ampersent = FALSE;
++ /* vimglob() function to define for Posix shell */
++ static char *sh_vimglob_func = "vimglob() { while [ $# -ge 1 ]; do echo -n \"$1\"; echo; shift; done }; vimglob >";
+
+ *num_file = 0; /* default: no files found */
+ *file = NULL;
+***************
+*** 5107,5115 ****
+
+ /*
+ * Let the shell expand the patterns and write the result into the temp
+! * file. if expanding `cmd` execute it directly.
+! * If we use csh, glob will work better than echo.
+! * If we use zsh, print -N will work better than glob.
+ */
+ if (num_pat == 1 && *pat[0] == '`'
+ && (len = STRLEN(pat[0])) > 2
+--- 5116,5132 ----
+
+ /*
+ * Let the shell expand the patterns and write the result into the temp
+! * file.
+! * STYLE_BT: NL separated
+! * If expanding `cmd` execute it directly.
+! * STYLE_GLOB: NUL separated
+! * If we use *csh, "glob" will work better than "echo".
+! * STYLE_PRINT: NL or NUL separated
+! * If we use *zsh, "print -N" will work better than "glob".
+! * STYLE_VIMGLOB: NL separated
+! * If we use *sh*, we define "vimglob()".
+! * STYLE_ECHO: space separated.
+! * A shell we don't know, stay safe and use "echo".
+ */
+ if (num_pat == 1 && *pat[0] == '`'
+ && (len = STRLEN(pat[0])) > 2
+***************
+*** 5122,5130 ****
+ else if (STRCMP(p_sh + len - 3, "zsh") == 0)
+ shell_style = STYLE_PRINT;
+ }
+!
+! /* "unset nonomatch; print -N >" plus two is 29 */
+ len = STRLEN(tempname) + 29;
+ for (i = 0; i < num_pat; ++i)
+ {
+ /* Count the length of the patterns in the same way as they are put in
+--- 5139,5155 ----
+ else if (STRCMP(p_sh + len - 3, "zsh") == 0)
+ shell_style = STYLE_PRINT;
+ }
+! if (shell_style == STYLE_ECHO && strstr((char *)gettail(p_sh),
+! "sh") != NULL)
+! shell_style = STYLE_VIMGLOB;
+!
+! /* Compute the length of the command. We need 2 extra bytes: for the
+! * optional '&' and for the NUL.
+! * Worst case: "unset nonomatch; print -N >" plus two is 29 */
+ len = STRLEN(tempname) + 29;
++ if (shell_style == STYLE_VIMGLOB)
++ len += STRLEN(sh_vimglob_func);
++
+ for (i = 0; i < num_pat; ++i)
+ {
+ /* Count the length of the patterns in the same way as they are put in
+***************
+*** 5183,5192 ****
+--- 5208,5221 ----
+ STRCAT(command, "glob >");
+ else if (shell_style == STYLE_PRINT)
+ STRCAT(command, "print -N >");
++ else if (shell_style == STYLE_VIMGLOB)
++ STRCAT(command, sh_vimglob_func);
+ else
+ STRCAT(command, "echo >");
+ }
++
+ STRCAT(command, tempname);
++
+ if (shell_style != STYLE_BT)
+ for (i = 0; i < num_pat; ++i)
+ {
+***************
+*** 5232,5239 ****
+ if (flags & EW_SILENT)
+ show_shell_mess = FALSE;
+ if (ampersent)
+! STRCAT(command, "&"); /* put the '&' back after the
+! redirection */
+
+ /*
+ * Using zsh -G: If a pattern has no matches, it is just deleted from
+--- 5261,5267 ----
+ if (flags & EW_SILENT)
+ show_shell_mess = FALSE;
+ if (ampersent)
+! STRCAT(command, "&"); /* put the '&' after the redirection */
+
+ /*
+ * Using zsh -G: If a pattern has no matches, it is just deleted from
+***************
+*** 5265,5271 ****
+ show_shell_mess = TRUE;
+ vim_free(command);
+
+! if (i) /* mch_call_shell() failed */
+ {
+ mch_remove(tempname);
+ vim_free(tempname);
+--- 5293,5299 ----
+ show_shell_mess = TRUE;
+ vim_free(command);
+
+! if (i != 0) /* mch_call_shell() failed */
+ {
+ mch_remove(tempname);
+ vim_free(tempname);
+***************
+*** 5336,5342 ****
+ }
+ vim_free(tempname);
+
+! #if defined(__CYGWIN__) || defined(__CYGWIN32__)
+ /* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */
+ p = buffer;
+ for (i = 0; i < len; ++i)
+--- 5364,5370 ----
+ }
+ vim_free(tempname);
+
+! # if defined(__CYGWIN__) || defined(__CYGWIN32__)
+ /* Translate <CR><NL> into <NL>. Caution, buffer may contain NUL. */
+ p = buffer;
+ for (i = 0; i < len; ++i)
+***************
+*** 5359,5365 ****
+ }
+ }
+ /* file names are separated with NL */
+! else if (shell_style == STYLE_BT)
+ {
+ buffer[len] = NUL; /* make sure the buffer ends in NUL */
+ p = buffer;
+--- 5387,5393 ----
+ }
+ }
+ /* file names are separated with NL */
+! else if (shell_style == STYLE_BT || shell_style == STYLE_VIMGLOB)
+ {
+ buffer[len] = NUL; /* make sure the buffer ends in NUL */
+ p = buffer;
+***************
+*** 5438,5444 ****
+ {
+ (*file)[i] = p;
+ /* Space or NL separates */
+! if (shell_style == STYLE_ECHO || shell_style == STYLE_BT)
+ {
+ while (!(shell_style == STYLE_ECHO && *p == ' ')
+ && *p != '\n' && *p != NUL)
+--- 5466,5473 ----
+ {
+ (*file)[i] = p;
+ /* Space or NL separates */
+! if (shell_style == STYLE_ECHO || shell_style == STYLE_BT
+! || shell_style == STYLE_VIMGLOB)
+ {
+ while (!(shell_style == STYLE_ECHO && *p == ' ')
+ && *p != '\n' && *p != NUL)
+*** ../vim-7.1.222/src/version.c Sun Jan 13 13:30:34 2008
+--- src/version.c Sun Jan 13 13:45:04 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 223,
+ /**/
+
+--
+User: I'm having problems with my text editor.
+Help desk: Which editor are you using?
+User: I don't know, but it's version VI (pronounced: 6).
+Help desk: Oh, then you should upgrade to version VIM (pronounced: 994).
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.224
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.224?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.224 (added)
+++ trunk/packages/vim/upstream/patches/7.1.224 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,73 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.224
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.224
+Problem: When using "vim -F -o file1 file2" only one window is
+ right-to-left. Same for "-H". (Ben Schmidt)
+Solution: use set_option_value() to set 'rightleft'.
+Files: src/main.c
+
+
+*** ../vim-7.1.223/src/main.c Fri Jan 11 20:25:42 2008
+--- src/main.c Sun Jan 13 16:12:09 2008
+***************
+*** 1775,1781 ****
+
+ case 'F': /* "-F" start in Farsi mode: rl + fkmap set */
+ #ifdef FEAT_FKMAP
+! curwin->w_p_rl = p_fkmap = TRUE;
+ #else
+ mch_errmsg(_(e_nofarsi));
+ mch_exit(2);
+--- 1775,1782 ----
+
+ case 'F': /* "-F" start in Farsi mode: rl + fkmap set */
+ #ifdef FEAT_FKMAP
+! p_fkmap = TRUE;
+! set_option_value((char_u *)"rl", 1L, NULL, 0);
+ #else
+ mch_errmsg(_(e_nofarsi));
+ mch_exit(2);
+***************
+*** 1792,1798 ****
+
+ case 'H': /* "-H" start in Hebrew mode: rl + hkmap set */
+ #ifdef FEAT_RIGHTLEFT
+! curwin->w_p_rl = p_hkmap = TRUE;
+ #else
+ mch_errmsg(_(e_nohebrew));
+ mch_exit(2);
+--- 1793,1800 ----
+
+ case 'H': /* "-H" start in Hebrew mode: rl + hkmap set */
+ #ifdef FEAT_RIGHTLEFT
+! p_hkmap = TRUE;
+! set_option_value((char_u *)"rl", 1L, NULL, 0);
+ #else
+ mch_errmsg(_(e_nohebrew));
+ mch_exit(2);
+*** ../vim-7.1.223/src/version.c Sun Jan 13 13:53:30 2008
+--- src/version.c Sun Jan 13 16:15:49 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 224,
+ /**/
+
+--
+LAUNCELOT: Isn't there a St. Aaaaarrrrrrggghhh's in Cornwall?
+ARTHUR: No, that's Saint Ives.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.225
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.225?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.225 (added)
+++ trunk/packages/vim/upstream/patches/7.1.225 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.225
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.225
+Problem: Using unitialized value when XGetWMNormalHints() fails.
+Solution: Check the return value. (Dominique Pelle)
+Files: src/os_unix.c
+
+
+*** ../vim-7.1.224/src/os_unix.c Sun Jan 13 13:53:30 2008
+--- src/os_unix.c Sun Jan 13 13:52:53 2008
+***************
+*** 6145,6153 ****
+ if (xterm_trace == 1)
+ {
+ /* Get the hints just before tracking starts. The font size might
+! * have changed recently */
+! XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints);
+! if (!(got_hints & PResizeInc)
+ || xterm_hints.width_inc <= 1
+ || xterm_hints.height_inc <= 1)
+ {
+--- 6145,6153 ----
+ if (xterm_trace == 1)
+ {
+ /* Get the hints just before tracking starts. The font size might
+! * have changed recently. */
+! if (!XGetWMNormalHints(xterm_dpy, x11_window, &xterm_hints, &got_hints)
+! || !(got_hints & PResizeInc)
+ || xterm_hints.width_inc <= 1
+ || xterm_hints.height_inc <= 1)
+ {
+*** ../vim-7.1.224/src/version.c Sun Jan 13 16:17:02 2008
+--- src/version.c Sun Jan 13 16:29:51 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 225,
+ /**/
+
+--
+"When I die, I want a tombstone that says "GAME OVER" - Ton Richters
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.226
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.226?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.226 (added)
+++ trunk/packages/vim/upstream/patches/7.1.226 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.226
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.226
+Problem: Command line completion doesn't work when a file name contains a
+ '&' character.
+Solution: Accept all characters in a file name, except ones that end a
+ command or white space.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.225/src/ex_docmd.c Wed Jan 9 20:29:51 2008
+--- src/ex_docmd.c Wed Jan 9 20:11:13 2008
+***************
+*** 3338,3349 ****
+ }
+ in_quote = !in_quote;
+ }
+ #ifdef SPACE_IN_FILENAME
+! else if (!vim_isfilec_or_wc(c)
+! && (!(ea.argt & NOSPC) || usefilter))
+! #else
+! else if (!vim_isfilec_or_wc(c))
+ #endif
+ {
+ while (*p != NUL)
+ {
+--- 3338,3350 ----
+ }
+ in_quote = !in_quote;
+ }
++ /* An argument can contain just about everything, except
++ * characters that end the command and white space. */
++ else if (c == '|' || c == '\n' || c == '"' || (vim_iswhite(c)
+ #ifdef SPACE_IN_FILENAME
+! && (!(ea.argt & NOSPC) || usefilter)
+ #endif
++ ))
+ {
+ while (*p != NUL)
+ {
+*** ../vim-7.1.225/src/version.c Sun Jan 13 16:30:23 2008
+--- src/version.c Sun Jan 13 17:10:15 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 226,
+ /**/
+
+--
+ [Another hideous roar.]
+BEDEVERE: That's it!
+ARTHUR: What?
+BEDEVERE: It's The Legendary Black Beast of Aaaaarrrrrrggghhh!
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.227
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.227?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.227 (added)
+++ trunk/packages/vim/upstream/patches/7.1.227 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,188 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.227
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.227
+Problem: Hang in syntax HL when moving over a ")". (Dominique Pelle)
+Solution: Avoid storing a syntax state in the wrong position in the list of
+ remembered states.
+Files: src/syntax.c
+
+
+*** ../vim-7.1.226/src/syntax.c Sat Jan 12 16:45:25 2008
+--- src/syntax.c Sat Jan 12 16:45:44 2008
+***************
+*** 372,378 ****
+ static int syn_stack_cleanup __ARGS((void));
+ static void syn_stack_free_entry __ARGS((buf_T *buf, synstate_T *p));
+ static synstate_T *syn_stack_find_entry __ARGS((linenr_T lnum));
+! static synstate_T *store_current_state __ARGS((synstate_T *sp));
+ static void load_current_state __ARGS((synstate_T *from));
+ static void invalidate_current_state __ARGS((void));
+ static int syn_stack_equal __ARGS((synstate_T *sp));
+--- 372,378 ----
+ static int syn_stack_cleanup __ARGS((void));
+ static void syn_stack_free_entry __ARGS((buf_T *buf, synstate_T *p));
+ static synstate_T *syn_stack_find_entry __ARGS((linenr_T lnum));
+! static synstate_T *store_current_state __ARGS((void));
+ static void load_current_state __ARGS((synstate_T *from));
+ static void invalidate_current_state __ARGS((void));
+ static int syn_stack_equal __ARGS((synstate_T *sp));
+***************
+*** 464,470 ****
+ synstate_T *p;
+ synstate_T *last_valid = NULL;
+ synstate_T *last_min_valid = NULL;
+! synstate_T *sp, *prev;
+ linenr_T parsed_lnum;
+ linenr_T first_stored;
+ int dist;
+--- 464,470 ----
+ synstate_T *p;
+ synstate_T *last_valid = NULL;
+ synstate_T *last_min_valid = NULL;
+! synstate_T *sp, *prev = NULL;
+ linenr_T parsed_lnum;
+ linenr_T first_stored;
+ int dist;
+***************
+*** 502,508 ****
+ if (!current_state_stored)
+ {
+ ++current_lnum;
+! (void)store_current_state(NULL);
+ }
+
+ /*
+--- 502,508 ----
+ if (!current_state_stored)
+ {
+ ++current_lnum;
+! (void)store_current_state();
+ }
+
+ /*
+***************
+*** 558,564 ****
+ dist = 999999;
+ else
+ dist = syn_buf->b_ml.ml_line_count / (syn_buf->b_sst_len - Rows) + 1;
+- prev = syn_stack_find_entry(current_lnum);
+ while (current_lnum < lnum)
+ {
+ syn_start_line();
+--- 558,563 ----
+***************
+*** 573,581 ****
+ * equal to the current state. If so, then validate all saved
+ * states that depended on a change before the parsed line. */
+ if (prev == NULL)
+ sp = syn_buf->b_sst_first;
+ else
+! sp = prev->sst_next;
+ if (sp != NULL
+ && sp->sst_lnum == current_lnum
+ && syn_stack_equal(sp))
+--- 572,584 ----
+ * equal to the current state. If so, then validate all saved
+ * states that depended on a change before the parsed line. */
+ if (prev == NULL)
++ prev = syn_stack_find_entry(current_lnum - 1);
++ if (prev == NULL)
+ sp = syn_buf->b_sst_first;
+ else
+! sp = prev;
+! while (sp != NULL && sp->sst_lnum < current_lnum)
+! sp = sp->sst_next;
+ if (sp != NULL
+ && sp->sst_lnum == current_lnum
+ && syn_stack_equal(sp))
+***************
+*** 601,607 ****
+ else if (prev == NULL
+ || current_lnum == lnum
+ || current_lnum >= prev->sst_lnum + dist)
+! prev = store_current_state(prev);
+ }
+
+ /* This can take a long time: break when CTRL-C pressed. The current
+--- 604,610 ----
+ else if (prev == NULL
+ || current_lnum == lnum
+ || current_lnum >= prev->sst_lnum + dist)
+! prev = store_current_state();
+ }
+
+ /* This can take a long time: break when CTRL-C pressed. The current
+***************
+*** 1353,1369 ****
+ * The current state must be valid for the start of the current_lnum line!
+ */
+ static synstate_T *
+! store_current_state(sp)
+! synstate_T *sp; /* at or before where state is to be saved or
+! NULL */
+ {
+ int i;
+ synstate_T *p;
+ bufstate_T *bp;
+ stateitem_T *cur_si;
+!
+! if (sp == NULL)
+! sp = syn_stack_find_entry(current_lnum);
+
+ /*
+ * If the current state contains a start or end pattern that continues
+--- 1356,1368 ----
+ * The current state must be valid for the start of the current_lnum line!
+ */
+ static synstate_T *
+! store_current_state()
+ {
+ int i;
+ synstate_T *p;
+ bufstate_T *bp;
+ stateitem_T *cur_si;
+! synstate_T *sp = syn_stack_find_entry(current_lnum);
+
+ /*
+ * If the current state contains a start or end pattern that continues
+***************
+*** 1667,1673 ****
+ * Store the current state in b_sst_array[] for later use.
+ */
+ ++current_lnum;
+! (void)store_current_state(NULL);
+ }
+ }
+
+--- 1666,1672 ----
+ * Store the current state in b_sst_array[] for later use.
+ */
+ ++current_lnum;
+! (void)store_current_state();
+ }
+ }
+
+*** ../vim-7.1.226/src/version.c Sun Jan 13 17:11:25 2008
+--- src/version.c Sun Jan 13 17:37:10 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 227,
+ /**/
+
+--
+Dreams are free, but there's a small charge for alterations.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.228
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.228?rev=1149&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.228 (added)
+++ trunk/packages/vim/upstream/patches/7.1.228 Mon Jan 14 18:19:11 2008
@@ -1,0 +1,51 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.228
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.228
+Problem: When 'foldmethod' is "indent" and a fold is created with ">>" it
+ can't be closed with "zc". (Daniel Shahaf)
+Solution: Reset the "small" flag of a fold when adding a line to it.
+Files: src/fold.c
+
+
+*** ../vim-7.1.227/src/fold.c Sun Oct 14 15:32:10 2007
+--- src/fold.c Sun Jan 13 21:26:48 2008
+***************
+*** 2676,2681 ****
+--- 2676,2682 ----
+ if (fp->fd_len < flp->lnum - fp->fd_top)
+ {
+ fp->fd_len = flp->lnum - fp->fd_top;
++ fp->fd_small = MAYBE;
+ fold_changed = TRUE;
+ }
+
+*** ../vim-7.1.227/src/version.c Sun Jan 13 17:39:29 2008
+--- src/version.c Sun Jan 13 21:56:53 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 228,
+ /**/
+
+--
+VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
+ and his knights seemed hopeless, when, suddenly ... the animator
+ suffered a fatal heart attack.
+ANIMATOR: Aaaaagh!
+VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
+ continue.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
More information about the pkg-vim-maintainers
mailing list