r1148 - in /trunk/packages/vim: debian/ runtime/syntax/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Mon Jan 14 18:18:27 UTC 2008
Author: jamessan
Date: Mon Jan 14 18:18:27 2008
New Revision: 1148
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1148
Log:
* New upstream patches (176 - 221), see README.gz for details.
* runtime/syntax/debcontrol.vim: Add s390x, sh3, sh3eb, sh4, sh4eb to the
list of recognized architectures. (Closes: #455993)
Added:
trunk/packages/vim/upstream/patches/7.1.215
trunk/packages/vim/upstream/patches/7.1.216
trunk/packages/vim/upstream/patches/7.1.217
trunk/packages/vim/upstream/patches/7.1.218
trunk/packages/vim/upstream/patches/7.1.219
trunk/packages/vim/upstream/patches/7.1.220
trunk/packages/vim/upstream/patches/7.1.221
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/runtime/syntax/debcontrol.vim
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1148&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Jan 14 18:18:27 2008
@@ -245,3 +245,10 @@
1491 7.1.212 accessing a byte before a line
1750 7.1.213 aborting ":tabedit" from the ATTENTION dialog leaves tab open
8399 7.1.214 ":1s/g\n\zs1//" deletes characters from the first line
+ 6476 7.1.215 it's difficult to figure out the nesting of syntax items
+ 2360 7.1.216 variants of --remote-tab are not mentioned for "vim --help"
+ 7103 7.1.217 the "help-tags" tag may be missing from runtime/doc/tags
+ 1864 7.1.218 syntax region without "keepend" could be truncated
+ 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
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1148&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Jan 14 18:18:27 2008
@@ -1,7 +1,7 @@
-vim (1:7.1-214+1) UNRELEASED; urgency=low
+vim (1:7.1-221+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (176 - 214), see README.gz for details.
+ * New upstream patches (176 - 221), see README.gz for details.
[ James Vega ]
* Add configure-tcl_detection.diff, which allows Vim's configure script to
@@ -14,8 +14,10 @@
- Drop unnecessary ruby and perl Build-Depends.
* runtime/syntax/debchangelog.vim: Adjust the "Closes" syntax highlighting
to allow newlines as part of the whitespace. (Closes: #460074)
-
- -- James Vega <jamessan at debian.org> Thu, 10 Jan 2008 08:35:44 -0500
+ * 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
vim (1:7.1-175+2) unstable; urgency=low
Modified: trunk/packages/vim/runtime/syntax/debcontrol.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/runtime/syntax/debcontrol.vim?rev=1148&op=diff
==============================================================================
--- trunk/packages/vim/runtime/syntax/debcontrol.vim (original)
+++ trunk/packages/vim/runtime/syntax/debcontrol.vim Mon Jan 14 18:18:27 2008
@@ -25,7 +25,7 @@
syn match debControlSpace " "
" Define some common expressions we can use later on
-syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(eb\)\=\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390\|sheb\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-\(i386\|gnu\)\|knetbsd-i386\|netbsd-\(alpha\|i386\)\)"
+syn match debcontrolArchitecture contained "\(all\|any\|alpha\|amd64\|arm\(e[bl]\)\=\|hppa\|i386\|ia64\|m32r\|m68k\|mipsel\|mips\|powerpc\|ppc64\|s390x\=\|sh[34]\(eb\)\=\|sh\|sparc64\|sparc\|hurd-i386\|kfreebsd-\(i386\|gnu\)\|knetbsd-i386\|netbsd-\(alpha\|i386\)\)"
syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
syn match debcontrolSection contained "\(\(contrib\|non-free\|non-US/main\|non-US/contrib\|non-US/non-free\|restricted\|universe\|multiverse\)/\)\=\(admin\|base\|comm\|devel\|doc\|editors\|electronics\|embedded\|games\|gnome\|graphics\|hamradio\|interpreters\|kde\|libs\|libdevel\|mail\|math\|misc\|net\|news\|oldlibs\|otherosfs\|perl\|python\|science\|shells\|sound\|text\|tex\|utils\|web\|x11\|debian-installer\)"
Added: trunk/packages/vim/upstream/patches/7.1.215
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.215?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.215 (added)
+++ trunk/packages/vim/upstream/patches/7.1.215 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,198 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.215
+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.215
+Problem: It is difficult to figure out what syntax items are nested at a
+ certain position.
+Solution: Add the synstack() function.
+Files: runtime/doc/eval.txt, src/eval.c, src/proto/syntax.pro,
+ src/syntax.c
+
+
+*** ../vim-7.1.214/runtime/doc/eval.txt Sun Jan 6 20:05:36 2008
+--- runtime/doc/eval.txt Thu Jan 10 22:20:31 2008
+***************
+*** 1,4 ****
+! *eval.txt* For Vim version 7.1. Last change: 2008 Jan 06
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt* For Vim version 7.1. Last change: 2008 Jan 10
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 1786,1791 ****
+--- 1786,1792 ----
+ synIDattr( {synID}, {what} [, {mode}])
+ String attribute {what} of syntax ID {synID}
+ synIDtrans( {synID}) Number translated syntax ID of {synID}
++ synstack({lnum}, {col}) List stack of syntax IDs at {lnum} and {col}
+ system( {expr} [, {input}]) String output of shell command/filter {expr}
+ tabpagebuflist( [{arg}]) List list of buffer numbers in tab page
+ tabpagenr( [{arg}]) Number number of current or last tab page
+***************
+*** 4962,4967 ****
+--- 4966,4989 ----
+ highlight the character. Highlight links given with
+ ":highlight link" are followed.
+
++ synstack({lnum}, {col}) *synstack()*
++ Return a |List|, which is the stack of syntax items at the
++ position {lnum} and {col} in the current window. Each item in
++ the List is an ID like what |synID()| returns.
++ The stack is the situation in between the character at "col"
++ and the next character. Note that a region of only one
++ character will not show up, it only exists inside that
++ character, not in between characters.
++ The first item in the List is the outer region, following are
++ items contained in that one. The last one is what |synID()|
++ returns, unless not the whole item is highlighted or it is a
++ transparent item.
++ This function is useful for debugging a syntax file.
++ Example that shows the syntax stack under the cursor: >
++ for id in synstack(line("."), col("."))
++ echo synIDattr(id, "name")
++ endfor
++
+ system({expr} [, {input}]) *system()* *E677*
+ Get the output of the shell command {expr}.
+ When {input} is given, this string is written to a file and
+*** ../vim-7.1.214/src/eval.c Sun Jan 6 20:05:36 2008
+--- src/eval.c Wed Jan 9 13:42:56 2008
+***************
+*** 651,656 ****
+--- 651,657 ----
+ static void f_synID __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_synIDattr __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_synIDtrans __ARGS((typval_T *argvars, typval_T *rettv));
++ static void f_synstack __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_system __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_tabpagebuflist __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_tabpagenr __ARGS((typval_T *argvars, typval_T *rettv));
+***************
+*** 7252,7257 ****
+--- 7253,7259 ----
+ {"synID", 3, 3, f_synID},
+ {"synIDattr", 2, 3, f_synIDattr},
+ {"synIDtrans", 1, 1, f_synIDtrans},
++ {"synstack", 2, 2, f_synstack},
+ {"system", 1, 2, f_system},
+ {"tabpagebuflist", 0, 1, f_tabpagebuflist},
+ {"tabpagenr", 0, 1, f_tabpagenr},
+***************
+*** 15843,15848 ****
+--- 15845,15890 ----
+ id = 0;
+
+ rettv->vval.v_number = id;
++ }
++
++ /*
++ * "synstack(lnum, col)" function
++ */
++ /*ARGSUSED*/
++ static void
++ f_synstack(argvars, rettv)
++ typval_T *argvars;
++ typval_T *rettv;
++ {
++ #ifdef FEAT_SYN_HL
++ long lnum;
++ long col;
++ int i;
++ int id;
++ #endif
++
++ rettv->v_type = VAR_LIST;
++ rettv->vval.v_list = NULL;
++
++ #ifdef FEAT_SYN_HL
++ lnum = get_tv_lnum(argvars); /* -1 on type error */
++ col = get_tv_number(&argvars[1]) - 1; /* -1 on type error */
++
++ if (lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
++ && col >= 0 && col < (long)STRLEN(ml_get(lnum))
++ && rettv_list_alloc(rettv) != FAIL)
++ {
++ (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL);
++ for (i = 0; ; ++i)
++ {
++ id = syn_get_stack_item(i);
++ if (id < 0)
++ break;
++ if (list_append_number(rettv->vval.v_list, id) == FAIL)
++ break;
++ }
++ }
++ #endif
+ }
+
+ /*
+*** ../vim-7.1.214/src/proto/syntax.pro Tue Jul 24 14:32:44 2007
+--- src/proto/syntax.pro Wed Jan 9 13:38:20 2008
+***************
+*** 13,18 ****
+--- 13,19 ----
+ void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg));
+ char_u *get_syntax_name __ARGS((expand_T *xp, int idx));
+ int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp));
++ int syn_get_stack_item __ARGS((int i));
+ int syn_get_foldlevel __ARGS((win_T *wp, long lnum));
+ void init_highlight __ARGS((int both, int reset));
+ int load_colors __ARGS((char_u *name));
+*** ../vim-7.1.214/src/syntax.c Sun Oct 7 15:21:31 2007
+--- src/syntax.c Wed Jan 9 15:17:47 2008
+***************
+*** 6104,6109 ****
+--- 6102,6123 ----
+
+ return (trans ? current_trans_id : current_id);
+ }
++
++ #if defined(FEAT_EVAL) || defined(PROTO)
++ /*
++ * Return the syntax ID at position "i" in the current stack.
++ * The caller must have called syn_get_id() before to fill the stack.
++ * Returns -1 when "i" is out of range.
++ */
++ int
++ syn_get_stack_item(i)
++ int i;
++ {
++ if (i >= current_state.ga_len )
++ return -1;
++ return CUR_STATE(i).si_id;
++ }
++ #endif
+
+ #if defined(FEAT_FOLDING) || defined(PROTO)
+ /*
+*** ../vim-7.1.214/src/version.c Wed Jan 9 22:39:55 2008
+--- src/version.c Thu Jan 10 22:17:38 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 215,
+ /**/
+
+--
+TALL KNIGHT: We are now no longer the Knights Who Say Ni!
+ONE KNIGHT: Ni!
+OTHERS: Sh!
+ONE KNIGHT: (whispers) Sorry.
+ "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.216
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.216?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.216 (added)
+++ trunk/packages/vim/upstream/patches/7.1.216 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.216
+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.216
+Problem: Variants of --remote-tab are not mentioned for "vim --help".
+Solution: Display optional -wait and -silent.
+Files: src/main.c
+
+
+*** ../vim-7.1.215/src/main.c Tue Sep 25 17:54:41 2007
+--- src/main.c Sun Dec 30 15:09:11 2007
+***************
+*** 3081,3087 ****
+ main_msg(_("--remote-wait <files> As --remote but wait for files to have been edited"));
+ main_msg(_("--remote-wait-silent <files> Same, don't complain if there is no server"));
+ # ifdef FEAT_WINDOWS
+! main_msg(_("--remote-tab <files> As --remote but open tab page for each file"));
+ # endif
+ main_msg(_("--remote-send <keys>\tSend <keys> to a Vim server and exit"));
+ main_msg(_("--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"));
+--- 3081,3087 ----
+ main_msg(_("--remote-wait <files> As --remote but wait for files to have been edited"));
+ main_msg(_("--remote-wait-silent <files> Same, don't complain if there is no server"));
+ # ifdef FEAT_WINDOWS
+! main_msg(_("--remote-tab[-wait][-silent] <files> As --remote but use tab page per file"));
+ # endif
+ main_msg(_("--remote-send <keys>\tSend <keys> to a Vim server and exit"));
+ main_msg(_("--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"));
+*** ../vim-7.1.215/src/version.c Thu Jan 10 22:23:22 2008
+--- src/version.c Fri Jan 11 20:25:14 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 216,
+ /**/
+
+--
+TIM: But follow only if you are men of valour. For the entrance to this cave
+ is guarded by a monster, a creature so foul and cruel that no man yet has
+ fought with it and lived. Bones of full fifty men lie strewn about its
+ lair ...
+ "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.217
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.217?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.217 (added)
+++ trunk/packages/vim/upstream/patches/7.1.217 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,228 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.217
+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.217
+Problem: The "help-tags" tag may be missing from runtime/doc/tags when it
+ was generated during "make install".
+Solution: Add the "++t" argument to ":helptags" to force adding the tag.
+Files: runtime/doc/Makefile, runtime/doc/various.txt, src/ex_cmds.c,
+ src/ex_cmds.h
+
+
+*** ../vim-7.1.216/runtime/doc/Makefile Sat May 5 19:14:15 2007
+--- runtime/doc/Makefile Fri Jan 11 20:55:34 2008
+***************
+*** 301,307 ****
+ # Use Vim to generate the tags file. Can only be used when Vim has been
+ # compiled and installed. Supports multiple languages.
+ vimtags: $(DOCS)
+! $(VIMEXE) -u NONE -esX -c "helptags ." -c quit
+
+ # Use "doctags" to generate the tags file. Only works for English!
+ tags: doctags $(DOCS)
+--- 301,307 ----
+ # Use Vim to generate the tags file. Can only be used when Vim has been
+ # compiled and installed. Supports multiple languages.
+ vimtags: $(DOCS)
+! $(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit
+
+ # Use "doctags" to generate the tags file. Only works for English!
+ tags: doctags $(DOCS)
+*** ../vim-7.1.216/runtime/doc/various.txt Sat May 12 17:05:26 2007
+--- runtime/doc/various.txt Fri Jan 11 20:45:45 2008
+***************
+*** 1,4 ****
+! *various.txt* For Vim version 7.1. Last change: 2007 Jan 14
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *various.txt* For Vim version 7.1. Last change: 2008 Jan 11
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 748,754 ****
+
+ *:helpt* *:helptags*
+ *E154* *E150* *E151* *E152* *E153* *E670*
+! :helpt[ags] {dir} Generate the help tags file(s) for directory {dir}.
+ All "*.txt" and "*.??x" files in the directory are
+ scanned for a help tag definition in between stars.
+ The "*.??x" files are for translated docs, they
+--- 754,761 ----
+
+ *:helpt* *:helptags*
+ *E154* *E150* *E151* *E152* *E153* *E670*
+! :helpt[ags] [++t] {dir}
+! Generate the help tags file(s) for directory {dir}.
+ All "*.txt" and "*.??x" files in the directory are
+ scanned for a help tag definition in between stars.
+ The "*.??x" files are for translated docs, they
+***************
+*** 756,761 ****
+--- 763,771 ----
+ The generated tags files are sorted.
+ When there are duplicates an error message is given.
+ An existing tags file is silently overwritten.
++ The optional "++t" argument forces adding the
++ "help-tags" tag. This is also done when the {dir} is
++ equal to $VIMRUNTIME/doc.
+ To rebuild the help tags in the runtime directory
+ (requires write permission there): >
+ :helptags $VIMRUNTIME/doc
+*** ../vim-7.1.216/src/ex_cmds.c Wed Jan 9 22:39:55 2008
+--- src/ex_cmds.c Fri Jan 11 20:47:13 2008
+***************
+*** 6091,6097 ****
+ }
+
+ #if defined(FEAT_EX_EXTRA) || defined(PROTO)
+! static void helptags_one __ARGS((char_u *dir, char_u *ext, char_u *lang));
+
+ /*
+ * ":helptags"
+--- 6091,6097 ----
+ }
+
+ #if defined(FEAT_EX_EXTRA) || defined(PROTO)
+! static void helptags_one __ARGS((char_u *dir, char_u *ext, char_u *lang, int add_help_tags));
+
+ /*
+ * ":helptags"
+***************
+*** 6110,6115 ****
+--- 6110,6123 ----
+ char_u fname[8];
+ int filecount;
+ char_u **files;
++ int add_help_tags = FALSE;
++
++ /* Check for ":helptags ++t {dir}". */
++ if (STRNCMP(eap->arg, "++t", 3) == 0 && vim_iswhite(eap->arg[3]))
++ {
++ add_help_tags = TRUE;
++ eap->arg = skipwhite(eap->arg + 3);
++ }
+
+ if (!mch_isdir(eap->arg))
+ {
+***************
+*** 6192,6198 ****
+ ext[1] = fname[5];
+ ext[2] = fname[6];
+ }
+! helptags_one(eap->arg, ext, fname);
+ }
+
+ ga_clear(&ga);
+--- 6200,6206 ----
+ ext[1] = fname[5];
+ ext[2] = fname[6];
+ }
+! helptags_one(eap->arg, ext, fname, add_help_tags);
+ }
+
+ ga_clear(&ga);
+***************
+*** 6200,6214 ****
+
+ #else
+ /* No language support, just use "*.txt" and "tags". */
+! helptags_one(eap->arg, (char_u *)".txt", (char_u *)"tags");
+ #endif
+ }
+
+ static void
+! helptags_one(dir, ext, tagfname)
+! char_u *dir; /* doc directory */
+! char_u *ext; /* suffix, ".txt", ".itx", ".frx", etc. */
+! char_u *tagfname; /* "tags" for English, "tags-it" for Italian. */
+ {
+ FILE *fd_tags;
+ FILE *fd;
+--- 6208,6223 ----
+
+ #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
+! 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;
+***************
+*** 6259,6268 ****
+ }
+
+ /*
+! * If generating tags for "$VIMRUNTIME/doc" add the "help-tags" tag.
+ */
+ ga_init2(&ga, (int)sizeof(char_u *), 100);
+! if (fullpathcmp((char_u *)"$VIMRUNTIME/doc", dir, FALSE) == FPC_SAME)
+ {
+ if (ga_grow(&ga, 1) == FAIL)
+ got_int = TRUE;
+--- 6268,6279 ----
+ }
+
+ /*
+! * If using the "++t" argument or generating tags for "$VIMRUNTIME/doc"
+! * add the "help-tags" tag.
+ */
+ ga_init2(&ga, (int)sizeof(char_u *), 100);
+! if (add_help_tags || fullpathcmp((char_u *)"$VIMRUNTIME/doc",
+! dir, FALSE) == FPC_SAME)
+ {
+ if (ga_grow(&ga, 1) == FAIL)
+ got_int = TRUE;
+*** ../vim-7.1.216/src/ex_cmds.h Thu Mar 8 11:00:55 2007
+--- src/ex_cmds.h Fri Jan 11 20:49:18 2008
+***************
+*** 422,428 ****
+ EX(CMD_helpgrep, "helpgrep", ex_helpgrep,
+ EXTRA|NOTRLCOM|NEEDARG),
+ EX(CMD_helptags, "helptags", ex_helptags,
+! NEEDARG|FILE1|TRLBAR|CMDWIN),
+ EX(CMD_hardcopy, "hardcopy", ex_hardcopy,
+ RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG),
+ EX(CMD_highlight, "highlight", ex_highlight,
+--- 422,428 ----
+ EX(CMD_helpgrep, "helpgrep", ex_helpgrep,
+ EXTRA|NOTRLCOM|NEEDARG),
+ EX(CMD_helptags, "helptags", ex_helptags,
+! NEEDARG|FILES|TRLBAR|CMDWIN),
+ EX(CMD_hardcopy, "hardcopy", ex_hardcopy,
+ RANGE|COUNT|EXTRA|TRLBAR|DFLALL|BANG),
+ EX(CMD_highlight, "highlight", ex_highlight,
+*** ../vim-7.1.216/src/version.c Fri Jan 11 20:25:42 2008
+--- src/version.c Fri Jan 11 20:58:44 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 217,
+ /**/
+
+--
+My girlfriend told me I should be more affectionate.
+So I got TWO girlfriends.
+
+ /// 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.218
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.218?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.218 (added)
+++ trunk/packages/vim/upstream/patches/7.1.218 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.218
+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.218
+Problem: A syntax region without a "keepend", containing a region with
+ "extend" could be truncated at the end of the containing region.
+Solution: Do not call syn_update_ends() when there are no keepend items.
+Files: src/syntax.c
+
+
+*** ../vim-7.1.217/src/syntax.c Thu Jan 10 22:23:22 2008
+--- src/syntax.c Wed Jan 9 15:17:47 2008
+***************
+*** 2495,2501 ****
+ if (current_state.ga_len == 0)
+ break;
+
+! if (had_extend)
+ {
+ syn_update_ends(FALSE);
+ if (current_state.ga_len == 0)
+--- 2493,2499 ----
+ if (current_state.ga_len == 0)
+ break;
+
+! if (had_extend && keepend_level >= 0)
+ {
+ syn_update_ends(FALSE);
+ if (current_state.ga_len == 0)
+*** ../vim-7.1.217/src/version.c Fri Jan 11 21:00:49 2008
+--- src/version.c Fri Jan 11 21:25:46 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 218,
+ /**/
+
+--
+The Law of VIM:
+For each member b of the possible behaviour space B of program P, there exists
+a finite time t before which at least one user u in the total user space U of
+program P will request b becomes a member of the allowed behaviour space B'
+(B' <= B).
+In other words: Sooner or later everyone wants everything as an option.
+ -- Vince Negri
+
+ /// 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.219
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.219?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.219 (added)
+++ trunk/packages/vim/upstream/patches/7.1.219 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,378 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.219
+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.219 (after 7.1.215)
+Problem: synstack() returns situation after the current character, can't
+ see the state for a one-character region.
+Solution: Don't update ending states in the requested column.
+Files: runtime/doc/eval.txt, src/eval.c, src/hardcopy.c,
+ src/proto/syntax.pro, src/screen.c, src/spell.c, src/syntax.c
+
+
+*** ../vim-7.1.218/runtime/doc/eval.txt Thu Jan 10 22:23:22 2008
+--- runtime/doc/eval.txt Fri Jan 11 22:04:59 2008
+***************
+*** 1,4 ****
+! *eval.txt* For Vim version 7.1. Last change: 2008 Jan 10
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt* For Vim version 7.1. Last change: 2008 Jan 11
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 4967,4976 ****
+ Return a |List|, which is the stack of syntax items at the
+ position {lnum} and {col} in the current window. Each item in
+ the List is an ID like what |synID()| returns.
+- The stack is the situation in between the character at "col"
+- and the next character. Note that a region of only one
+- character will not show up, it only exists inside that
+- character, not in between characters.
+ The first item in the List is the outer region, following are
+ items contained in that one. The last one is what |synID()|
+ returns, unless not the whole item is highlighted or it is a
+--- 4970,4975 ----
+*** ../vim-7.1.218/src/eval.c Thu Jan 10 22:23:22 2008
+--- src/eval.c Fri Jan 11 21:46:12 2008
+***************
+*** 15725,15731 ****
+
+ if (!transerr && lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
+ && col >= 0 && col < (long)STRLEN(ml_get(lnum)))
+! id = syn_get_id(curwin, lnum, (colnr_T)col, trans, NULL);
+ #endif
+
+ rettv->vval.v_number = id;
+--- 15725,15731 ----
+
+ if (!transerr && lnum >= 1 && lnum <= curbuf->b_ml.ml_line_count
+ && col >= 0 && col < (long)STRLEN(ml_get(lnum)))
+! id = syn_get_id(curwin, lnum, (colnr_T)col, trans, NULL, FALSE);
+ #endif
+
+ rettv->vval.v_number = id;
+***************
+*** 15874,15880 ****
+ && col >= 0 && col < (long)STRLEN(ml_get(lnum))
+ && rettv_list_alloc(rettv) != FAIL)
+ {
+! (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL);
+ for (i = 0; ; ++i)
+ {
+ id = syn_get_stack_item(i);
+--- 15874,15880 ----
+ && col >= 0 && col < (long)STRLEN(ml_get(lnum))
+ && rettv_list_alloc(rettv) != FAIL)
+ {
+! (void)syn_get_id(curwin, lnum, (colnr_T)col, FALSE, NULL, TRUE);
+ for (i = 0; ; ++i)
+ {
+ id = syn_get_stack_item(i);
+*** ../vim-7.1.218/src/hardcopy.c Thu May 10 20:40:02 2007
+--- src/hardcopy.c Fri Jan 11 21:46:20 2008
+***************
+*** 876,882 ****
+ */
+ if (psettings->do_syntax)
+ {
+! id = syn_get_id(curwin, ppos->file_line, col, 1, NULL);
+ if (id > 0)
+ id = syn_get_final_id(id);
+ else
+--- 876,882 ----
+ */
+ if (psettings->do_syntax)
+ {
+! id = syn_get_id(curwin, ppos->file_line, col, 1, NULL, FALSE);
+ if (id > 0)
+ id = syn_get_final_id(id);
+ else
+*** ../vim-7.1.218/src/proto/syntax.pro Thu Jan 10 22:23:22 2008
+--- src/proto/syntax.pro Fri Jan 11 21:54:19 2008
+***************
+*** 4,10 ****
+ void syn_stack_apply_changes __ARGS((buf_T *buf));
+ void syntax_end_parsing __ARGS((linenr_T lnum));
+ int syntax_check_changed __ARGS((linenr_T lnum));
+! int get_syntax_attr __ARGS((colnr_T col, int *can_spell));
+ void syntax_clear __ARGS((buf_T *buf));
+ void ex_syntax __ARGS((exarg_T *eap));
+ int syntax_present __ARGS((buf_T *buf));
+--- 4,10 ----
+ void syn_stack_apply_changes __ARGS((buf_T *buf));
+ void syntax_end_parsing __ARGS((linenr_T lnum));
+ int syntax_check_changed __ARGS((linenr_T lnum));
+! int get_syntax_attr __ARGS((colnr_T col, int *can_spell, int keep_state));
+ void syntax_clear __ARGS((buf_T *buf));
+ void ex_syntax __ARGS((exarg_T *eap));
+ int syntax_present __ARGS((buf_T *buf));
+***************
+*** 12,18 ****
+ void set_context_in_echohl_cmd __ARGS((expand_T *xp, char_u *arg));
+ void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg));
+ char_u *get_syntax_name __ARGS((expand_T *xp, int idx));
+! int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp));
+ int syn_get_stack_item __ARGS((int i));
+ int syn_get_foldlevel __ARGS((win_T *wp, long lnum));
+ void init_highlight __ARGS((int both, int reset));
+--- 12,18 ----
+ void set_context_in_echohl_cmd __ARGS((expand_T *xp, char_u *arg));
+ void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg));
+ char_u *get_syntax_name __ARGS((expand_T *xp, int idx));
+! int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp, int keep_state));
+ int syn_get_stack_item __ARGS((int i));
+ int syn_get_foldlevel __ARGS((win_T *wp, long lnum));
+ void init_highlight __ARGS((int both, int reset));
+*** ../vim-7.1.218/src/screen.c Thu Nov 8 21:23:34 2007
+--- src/screen.c Fri Jan 11 21:48:10 2008
+***************
+*** 3885,3891 ****
+ # ifdef FEAT_SPELL
+ has_spell ? &can_spell :
+ # endif
+! NULL);
+
+ if (did_emsg)
+ {
+--- 3885,3891 ----
+ # ifdef FEAT_SPELL
+ has_spell ? &can_spell :
+ # endif
+! NULL, FALSE);
+
+ if (did_emsg)
+ {
+*** ../vim-7.1.218/src/spell.c Sun Aug 5 18:32:21 2007
+--- src/spell.c Fri Jan 11 21:46:50 2008
+***************
+*** 2146,2152 ****
+ {
+ col = (int)(p - buf);
+ (void)syn_get_id(wp, lnum, (colnr_T)col,
+! FALSE, &can_spell);
+ if (!can_spell)
+ attr = HLF_COUNT;
+ }
+--- 2146,2152 ----
+ {
+ col = (int)(p - buf);
+ (void)syn_get_id(wp, lnum, (colnr_T)col,
+! FALSE, &can_spell, FALSE);
+ if (!can_spell)
+ attr = HLF_COUNT;
+ }
+*** ../vim-7.1.218/src/syntax.c Fri Jan 11 21:26:49 2008
+--- src/syntax.c Sat Jan 12 16:42:25 2008
+***************
+*** 378,384 ****
+ static int syn_stack_equal __ARGS((synstate_T *sp));
+ static void validate_current_state __ARGS((void));
+ static int syn_finish_line __ARGS((int syncing));
+! static int syn_current_attr __ARGS((int syncing, int displaying, int *can_spell));
+ static int did_match_already __ARGS((int idx, garray_T *gap));
+ static stateitem_T *push_next_match __ARGS((stateitem_T *cur_si));
+ static void check_state_ends __ARGS((void));
+--- 378,384 ----
+ static int syn_stack_equal __ARGS((synstate_T *sp));
+ static void validate_current_state __ARGS((void));
+ static int syn_finish_line __ARGS((int syncing));
+! static int syn_current_attr __ARGS((int syncing, int displaying, int *can_spell, int keep_state));
+ static int did_match_already __ARGS((int idx, garray_T *gap));
+ static stateitem_T *push_next_match __ARGS((stateitem_T *cur_si));
+ static void check_state_ends __ARGS((void));
+***************
+*** 1691,1697 ****
+ {
+ while (!current_finished)
+ {
+! (void)syn_current_attr(syncing, FALSE, NULL);
+ /*
+ * When syncing, and found some item, need to check the item.
+ */
+--- 1690,1696 ----
+ {
+ while (!current_finished)
+ {
+! (void)syn_current_attr(syncing, FALSE, NULL, FALSE);
+ /*
+ * When syncing, and found some item, need to check the item.
+ */
+***************
+*** 1731,1739 ****
+ * done.
+ */
+ int
+! get_syntax_attr(col, can_spell)
+ colnr_T col;
+ int *can_spell;
+ {
+ int attr = 0;
+
+--- 1730,1739 ----
+ * done.
+ */
+ int
+! get_syntax_attr(col, can_spell, keep_state)
+ colnr_T col;
+ int *can_spell;
++ int keep_state; /* keep state of char at "col" */
+ {
+ int attr = 0;
+
+***************
+*** 1768,1774 ****
+ */
+ while (current_col <= col)
+ {
+! attr = syn_current_attr(FALSE, TRUE, can_spell);
+ ++current_col;
+ }
+
+--- 1768,1775 ----
+ */
+ while (current_col <= col)
+ {
+! attr = syn_current_attr(FALSE, TRUE, can_spell,
+! current_col == col ? keep_state : FALSE);
+ ++current_col;
+ }
+
+***************
+*** 1779,1788 ****
+ * Get syntax attributes for current_lnum, current_col.
+ */
+ static int
+! syn_current_attr(syncing, displaying, can_spell)
+ int syncing; /* When 1: called for syncing */
+ int displaying; /* result will be displayed */
+ int *can_spell; /* return: do spell checking */
+ {
+ int syn_id;
+ lpos_T endpos; /* was: char_u *endp; */
+--- 1780,1790 ----
+ * Get syntax attributes for current_lnum, current_col.
+ */
+ static int
+! syn_current_attr(syncing, displaying, can_spell, keep_state)
+ int syncing; /* When 1: called for syncing */
+ int displaying; /* result will be displayed */
+ int *can_spell; /* return: do spell checking */
++ int keep_state; /* keep syntax stack afterwards */
+ {
+ int syn_id;
+ lpos_T endpos; /* was: char_u *endp; */
+***************
+*** 2298,2304 ****
+ * may be for an empty match and a containing item might end in the
+ * current column.
+ */
+! if (!syncing)
+ {
+ check_state_ends();
+ if (current_state.ga_len > 0
+--- 2300,2306 ----
+ * may be for an empty match and a containing item might end in the
+ * current column.
+ */
+! if (!syncing && !keep_state)
+ {
+ check_state_ends();
+ if (current_state.ga_len > 0
+***************
+*** 6086,6097 ****
+ * Function called for expression evaluation: get syntax ID at file position.
+ */
+ int
+! syn_get_id(wp, lnum, col, trans, spellp)
+ win_T *wp;
+ long lnum;
+ colnr_T col;
+! int trans; /* remove transparancy */
+! int *spellp; /* return: can do spell checking */
+ {
+ /* When the position is not after the current position and in the same
+ * line of the same buffer, need to restart parsing. */
+--- 6088,6100 ----
+ * Function called for expression evaluation: get syntax ID at file position.
+ */
+ int
+! syn_get_id(wp, lnum, col, trans, spellp, keep_state)
+ win_T *wp;
+ long lnum;
+ colnr_T col;
+! int trans; /* remove transparancy */
+! int *spellp; /* return: can do spell checking */
+! int keep_state; /* keep state of char at "col" */
+ {
+ /* When the position is not after the current position and in the same
+ * line of the same buffer, need to restart parsing. */
+***************
+*** 6100,6106 ****
+ || col < current_col)
+ syntax_start(wp, lnum);
+
+! (void)get_syntax_attr(col, spellp);
+
+ return (trans ? current_trans_id : current_id);
+ }
+--- 6103,6109 ----
+ || col < current_col)
+ syntax_start(wp, lnum);
+
+! (void)get_syntax_attr(col, spellp, keep_state);
+
+ return (trans ? current_trans_id : current_id);
+ }
+***************
+*** 6115,6122 ****
+ syn_get_stack_item(i)
+ int i;
+ {
+! if (i >= current_state.ga_len )
+ return -1;
+ return CUR_STATE(i).si_id;
+ }
+ #endif
+--- 6118,6131 ----
+ syn_get_stack_item(i)
+ int i;
+ {
+! if (i >= current_state.ga_len)
+! {
+! /* Need to invalidate the state, because we didn't properly finish it
+! * for the last character, "keep_state" was TRUE. */
+! invalidate_current_state();
+! current_col = MAXCOL;
+ return -1;
++ }
+ return CUR_STATE(i).si_id;
+ }
+ #endif
+*** ../vim-7.1.218/src/version.c Fri Jan 11 21:26:49 2008
+--- src/version.c Sat Jan 12 16:40:47 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 219,
+ /**/
+
+--
+ARTHUR: Go on, Bors, chop its head off.
+BORS: Right. Silly little bleeder. One rabbit stew coming up.
+ "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.220
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.220?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.220 (added)
+++ trunk/packages/vim/upstream/patches/7.1.220 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,136 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.220
+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.220
+Problem: When a ")" or word movement command moves the cursor back from the
+ end of the line it may end up on the trail byte of a multi-byte
+ character. It's also moved back when it isn't needed.
+Solution: Add the adjust_cursor() function.
+Files: src/normal.c
+
+
+*** ../vim-7.1.219/src/normal.c Sun Jan 6 20:05:36 2008
+--- src/normal.c Sat Jan 12 17:10:14 2008
+***************
+*** 150,155 ****
+--- 150,156 ----
+ static void nv_bck_word __ARGS((cmdarg_T *cap));
+ static void nv_wordcmd __ARGS((cmdarg_T *cap));
+ static void nv_beginline __ARGS((cmdarg_T *cap));
++ static void adjust_cursor __ARGS((oparg_T *oap));
+ #ifdef FEAT_VISUAL
+ static void adjust_for_sel __ARGS((cmdarg_T *cap));
+ static int unadjust_for_sel __ARGS((void));
+***************
+*** 6567,6578 ****
+ clearopbeep(cap->oap);
+ else
+ {
+! /* Don't leave the cursor on the NUL past a line */
+! if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
+! {
+! --curwin->w_cursor.col;
+! cap->oap->inclusive = TRUE;
+! }
+ #ifdef FEAT_VIRTUALEDIT
+ curwin->w_cursor.coladd = 0;
+ #endif
+--- 6568,6575 ----
+ clearopbeep(cap->oap);
+ else
+ {
+! /* Don't leave the cursor on the NUL past end of line. */
+! adjust_cursor(cap->oap);
+ #ifdef FEAT_VIRTUALEDIT
+ curwin->w_cursor.coladd = 0;
+ #endif
+***************
+*** 8408,8419 ****
+ else
+ n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
+
+! /* Don't leave the cursor on the NUL past a line */
+! if (n != FAIL && curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
+! {
+! --curwin->w_cursor.col;
+! cap->oap->inclusive = TRUE;
+! }
+
+ if (n == FAIL && cap->oap->op_type == OP_NOP)
+ clearopbeep(cap->oap);
+--- 8405,8413 ----
+ else
+ n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
+
+! /* Don't leave the cursor on the NUL past the end of line. */
+! if (n != FAIL)
+! adjust_cursor(cap->oap);
+
+ if (n == FAIL && cap->oap->op_type == OP_NOP)
+ clearopbeep(cap->oap);
+***************
+*** 8426,8431 ****
+--- 8420,8458 ----
+ if ((fdo_flags & FDO_HOR) && KeyTyped && cap->oap->op_type == OP_NOP)
+ foldOpenCursor();
+ #endif
++ }
++ }
++
++ /*
++ * Used after a movement command: If the cursor ends up on the NUL after the
++ * end of the line, may move it back to the last character and make the motion
++ * inclusive.
++ */
++ static void
++ adjust_cursor(oap)
++ oparg_T *oap;
++ {
++ /* The cursor cannot remain on the NUL when:
++ * - the column is > 0
++ * - not in Visual mode or 'selection' is "o"
++ * - 'virtualedit' is not "all" and not "onemore".
++ */
++ if (curwin->w_cursor.col > 0 && gchar_cursor() == NUL
++ #ifdef FEAT_VISUAL
++ && (!VIsual_active || *p_sel == 'o')
++ #endif
++ #ifdef FEAT_VIRTUALEDIT
++ && !virtual_active() && (ve_flags & VE_ONEMORE) == 0
++ #endif
++ )
++ {
++ --curwin->w_cursor.col;
++ #ifdef FEAT_MBYTE
++ /* prevent cursor from moving on the trail byte */
++ if (has_mbyte)
++ mb_adjust_cursor();
++ #endif
++ oap->inclusive = TRUE;
+ }
+ }
+
+*** ../vim-7.1.219/src/version.c Sat Jan 12 16:45:25 2008
+--- src/version.c Sat Jan 12 17:07:28 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 220,
+ /**/
+
+--
+A hamburger walks into a bar, and the bartender says: "I'm sorry,
+but we don't serve food here."
+
+ /// 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.221
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.221?rev=1148&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.221 (added)
+++ trunk/packages/vim/upstream/patches/7.1.221 Mon Jan 14 18:18:27 2008
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.221
+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.221
+Problem: When inserting a "(", triggering the matchparen plugin, the
+ following highlighting may be messed up.
+Solution: Before triggering the CursorMovedI autocommands update the display
+ to update the stored syntax stacks for the change.
+Files: src/edit.c
+
+
+*** ../vim-7.1.220/src/edit.c Wed Jan 9 10:13:24 2008
+--- src/edit.c Sat Jan 12 16:07:41 2008
+***************
+*** 1455,1460 ****
+--- 1455,1468 ----
+ # endif
+ )
+ {
++ # ifdef FEAT_SYN_HL
++ /* Need to update the screen first, to make sure syntax
++ * highlighting is correct after making a change (e.g., inserting
++ * a "(". The autocommand may also require a redraw, so it's done
++ * again below, unfortunately. */
++ if (syntax_present(curbuf) && must_redraw)
++ update_screen(0);
++ # endif
+ apply_autocmds(EVENT_CURSORMOVEDI, NULL, NULL, FALSE, curbuf);
+ last_cursormoved = curwin->w_cursor;
+ }
+*** ../vim-7.1.220/src/version.c Sat Jan 12 17:11:25 2008
+--- src/version.c Sat Jan 12 18:11:22 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 221,
+ /**/
+
+--
+ROBIN: The what?
+ARTHUR: The Holy Hand Grenade of Antioch. 'Tis one of the sacred relics
+ Brother Maynard always carries with him.
+ALL: Yes. Of course.
+ARTHUR: (shouting) Bring up the Holy Hand Grenade!
+ "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