r1073 - in /trunk/packages/vim: debian/ patches/ runtime/ftplugin/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Oct 30 15:48:59 UTC 2007
Author: jamessan
Date: Tue Oct 30 15:48:59 2007
New Revision: 1073
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1073
Log:
* New upstream patches (139 - 146), see README.gz for details.
* ftplugin/debchangelog.vim:
- Fix NewVersion() to use the distribution from the previous changelog
entry. (Closes: #446728)
- Fix NewVersion() to increment the version of the first changelog entry
regardless of how 'startofline' is set.
* Add sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
single-quotes. (Closes: #425443)
Added:
trunk/packages/vim/patches/sh.vim_syntax.diff
trunk/packages/vim/upstream/patches/7.1.139
trunk/packages/vim/upstream/patches/7.1.140
trunk/packages/vim/upstream/patches/7.1.141
trunk/packages/vim/upstream/patches/7.1.142
trunk/packages/vim/upstream/patches/7.1.143
trunk/packages/vim/upstream/patches/7.1.144
trunk/packages/vim/upstream/patches/7.1.145
trunk/packages/vim/upstream/patches/7.1.146
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/series
trunk/packages/vim/runtime/ftplugin/debchangelog.vim
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1073&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Oct 30 15:48:59 2007
@@ -167,3 +167,11 @@
1522 7.1.136 memory leak when using Ruby syntax highlighting
1553 7.1.137 build failure when using EXITFREE
1836 7.1.138 Perl: Msg() doesn't stop when "q" is typed at the more prompt
+ 1557 7.1.139 fold truncated when ending Insert mode with CTRL-C
+ 1664 7.1.140 v:count can't be used in an expression mapping
+ 2806 7.1.141 GTK: can't use negative offset with -geom argument
+ 2161 7.1.142 ":redir @A>" doesn't work
+ 1723 7.1.143 uninitialized memory read when diffing three files
+ 1250 7.1.144 after ":diffup" cursor can be in the wrong position
+ 6160 7.1.145 stay in Insert completion mode depending on the char typed
+ 2838 7.1.146 VMS: writing fails for rare record organisation
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1073&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Oct 30 15:48:59 2007
@@ -1,8 +1,18 @@
-vim (1:7.1-138+2) UNRELEASED; urgency=low
-
- * NOT RELEASED YET
-
- -- James Vega <jamessan at debian.org> Sat, 13 Oct 2007 13:44:41 -0400
+vim (1:7.1-146+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (139 - 146), see README.gz for details.
+
+ [ James Vega ]
+ * ftplugin/debchangelog.vim:
+ - Fix NewVersion() to use the distribution from the previous changelog
+ entry. (Closes: #446728)
+ - Fix NewVersion() to increment the version of the first changelog entry
+ regardless of how 'startofline' is set.
+ * Add sh.vim_syntax.diff, which fixes the syntax highlighting of escaped
+ single-quotes. (Closes: #425443)
+
+ -- James Vega <jamessan at debian.org> Tue, 30 Oct 2007 11:48:23 -0400
vim (1:7.1-138+1) unstable; urgency=medium
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1073&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Tue Oct 30 15:48:59 2007
@@ -20,3 +20,4 @@
de.po.diff -p0
samba.vim.diff -p0
tex.vim-syntax_additions.diff -p0
+sh.vim_syntax.diff -p0
Added: trunk/packages/vim/patches/sh.vim_syntax.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/sh.vim_syntax.diff?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/patches/sh.vim_syntax.diff (added)
+++ trunk/packages/vim/patches/sh.vim_syntax.diff Tue Oct 30 15:48:59 2007
@@ -1,0 +1,115 @@
+Index: vim/runtime/syntax/sh.vim
+===================================================================
+--- vim/runtime/syntax/sh.vim.orig
++++ vim/runtime/syntax/sh.vim
+@@ -2,8 +2,8 @@
+ " Language: shell (sh) Korn shell (ksh) bash (sh)
+ " Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS at PcampbellAfamily.Mbiz>
+ " Previous Maintainer: Lennart Schultz <Lennart.Schultz at ecmwf.int>
+-" Last Change: Dec 12, 2006
+-" Version: 89
++" Last Change: Oct 22, 2007
++" Version: 90 ASTRO-ONLY
+ " URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+ "
+ " Using the following VIM variables: {{{1
+@@ -73,12 +73,12 @@
+ syn cluster shCaseEsacList contains=shCaseStart,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq
+ syn cluster shCaseList contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
+ syn cluster shColonList contains=@shCaseList
+-syn cluster shCommandSubList contains=shArithmetic,shDeref,shDerefSimple,shNumber,shOperator,shPosnParm,shExSingleQuote,shSingleQuote,shDoubleQuote,shStatement,shVariable,shSubSh,shAlias,shTest,shCtrlSeq
++syn cluster shCommandSubList contains=shArithmetic,shDeref,shDerefSimple,shNumber,shOperator,shPosnParm,shExSingleQuote,shSingleQuote,shDoubleQuote,shStatement,shVariable,shSubSh,shAlias,shTest,shCtrlSeq,shSpecial
+ syn cluster shCurlyList contains=shNumber,shComma,shDeref,shDerefSimple,shDerefSpecial
+ syn cluster shDblQuoteList contains=shCommandSub,shDeref,shDerefSimple,shPosnParm,shExSingleQuote,shCtrlSeq,shSpecial
+ syn cluster shDerefList contains=shDeref,shDerefSimple,shDerefVar,shDerefSpecial,shDerefWordError,shDerefPPS
+ syn cluster shDerefVarList contains=shDerefOp,shDerefVarArray,shDerefOpError
+-syn cluster shEchoList contains=shArithmetic,shCommandSub,shDeref,shDerefSimple,shExpr,shExSingleQuote,shSingleQuote,shDoubleQuote,shCtrlSeq
++syn cluster shEchoList contains=shArithmetic,shCommandSub,shDeref,shDerefSimple,shExpr,shExSingleQuote,shSingleQuote,shDoubleQuote,shCtrlSeq,shEchoQuote
+ syn cluster shExprList1 contains=shCharClass,shNumber,shOperator,shExSingleQuote,shSingleQuote,shDoubleQuote,shExpr,shDblBrace,shDeref,shDerefSimple,shCtrlSeq
+ syn cluster shExprList2 contains=@shExprList1, at shCaseList,shTest
+ syn cluster shFunctionList contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shFunctionStart,shCtrlSeq
+@@ -99,8 +99,9 @@
+ " This one is needed INSIDE a CommandSub, so that `echo bla` be correct
+ syn region shEcho matchgroup=shStatement start="\<echo\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="#"me=e-1 contains=@shEchoList
+ syn region shEcho matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|()]"me=e-1 end="\d[<>]"me=e-2 end="#"me=e-1 contains=@shEchoList
++syn match shEchoQuote contained '\%(\\\\\)*\\["`']'
+
+-" This must be after the strings, so that bla \" be correct
++" This must be after the strings, so that ... \" will be correct
+ syn region shEmbeddedEcho contained matchgroup=shStatement start="\<print\>" skip="\\$" matchgroup=shOperator end="$" matchgroup=NONE end="[<>;&|`)]"me=e-1 end="\d[<>]"me=e-2 end="#"me=e-1 contains=shNumber,shExSingleQuote,shSingleQuote,shDeref,shDerefSimple,shSpecialVar,shOperator,shDoubleQuote,shCharClass,shCtrlSeq
+
+ " Alias: {{{1
+@@ -182,7 +183,8 @@
+ syn region shFor matchgroup=shLoop start="\<for\>" end="\<in\>" end="\<do\>"me=e-2 contains=@shLoopList,shDblParen skipwhite nextgroup=shCurlyIn
+ endif
+ if exists("b:is_kornshell") || exists("b:is_bash")
+- syn cluster shCaseList add=shRepeat
++ syn cluster shCaseList add=shRepeat
++ syn cluster shFunctionList add=shRepeat
+ syn region shRepeat matchgroup=shLoop start="\<while\>" end="\<in\>" end="\<do\>"me=e-2 contains=@shLoopList,shDblParen,shDblBrace
+ syn region shRepeat matchgroup=shLoop start="\<until\>" end="\<in\>" end="\<do\>"me=e-2 contains=@shLoopList,shDblParen,shDblBrace
+ syn region shCaseEsac matchgroup=shConditional start="\<select\>" matchgroup=shConditional end="\<in\>" end="\<do\>" contains=@shLoopList
+@@ -195,9 +197,9 @@
+
+ " Case: case...esac {{{1
+ " ====
+-syn match shCaseBar contained skipwhite "[^|"`'()]\{-}|"hs=e nextgroup=shCase,shCaseStart,shCaseBar,shComment,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote
++syn match shCaseBar contained skipwhite "\(^\|[^\\]\)\(\\\\\)*\zs|" nextgroup=shCase,shCaseStart,shCaseBar,shComment,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote
+ syn match shCaseStart contained skipwhite skipnl "(" nextgroup=shCase,shCaseBar
+-syn region shCase contained skipwhite skipnl matchgroup=shSnglCase start="\([^#$()'" \t]\|\\.\)\{-})"ms=s,hs=e end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,shComment
++syn region shCase contained skipwhite skipnl matchgroup=shSnglCase start="\%(\\.\|[^#$()'" \t]\)\{-}\zs)" end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,shComment
+ if g:sh_fold_enabled
+ syn region shCaseEsac fold matchgroup=shConditional start="\<case\>" end="\<esac\>" contains=@shCaseEsacList
+ else
+@@ -344,14 +346,12 @@
+
+ " Functions: {{{1
+ syn keyword shFunctionKey function skipwhite skipnl nextgroup=shFunctionTwo
+-" COMBAK -- look at bash09. function foo() (line#35) is folding 38 lines. Not being terminated properly
+-"syn match shFunctionStart "{" contained
+ if g:sh_fold_enabled
+- syn region shFunctionOne transparent fold start="^\s*\h\w*\s*()\_s*\ze{" matchgroup=shFunctionStart end="}" contains=@shFunctionList skipwhite skipnl nextgroup=shFunctionStart
+- syn region shFunctionTwo transparent fold start="\h\w*\s*\%(()\)\=\_s*\ze{" matchgroup=shFunctionStart end="}" contains=shFunctionKey, at shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart
++ syn region shFunctionOne fold matchgroup=shFunction start="^\s*\h\w*\s*()\_s*{" end="}" contains=@shFunctionList skipwhite skipnl nextgroup=shFunctionStart
++ syn region shFunctionTwo fold matchgroup=shFunction start="\h\w*\s*\%(()\)\=\_s*{" end="}" contains=shFunctionKey, at shFunctionList contained skipwhite skipnl nextgroup=shFunctionStart
+ else
+- syn region shFunctionOne transparent start="^\s*\h\w*\s*()\_s*\ze{" matchgroup=shFunctionStart end="}" contains=@shFunctionList
+- syn region shFunctionTwo transparent start="\h\w*\s*\%(()\)\=\_s*\ze{" matchgroup=shFunctionStart end="}" contains=shFunctionKey, at shFunctionList contained
++ syn region shFunctionOne matchgroup=shFunction start="^\s*\h\w*\s*()\_s*{" end="}" contains=@shFunctionList
++ syn region shFunctionTwo matchgroup=shFunction start="\h\w*\s*\%(()\)\=\_s*{" end="}" contains=shFunctionKey, at shFunctionList contained
+ endif
+
+ " Parameter Dereferencing: {{{1
+@@ -399,9 +399,9 @@
+ syn region shDerefPattern contained start="{" end="}" contains=shDeref,shDerefSimple,shDerefString,shCommandSub nextgroup=shDerefPattern
+ syn match shDerefEscape contained '\%(\\\\\)*\\.'
+ endif
+-syn region shDerefString contained matchgroup=shOperator start=+'+ end=+'+ contains=shStringSpecial
+-syn region shDerefString contained matchgroup=shOperator start=+"+ skip=+\\"+ end=+"+ contains=@shDblQuoteList,shStringSpecial
+-syn match shDerefString contained "\\["']"
++syn region shDerefString contained matchgroup=shOperator start=+\%(\\\)\@<!'+ end=+'+ contains=shStringSpecial
++syn region shDerefString contained matchgroup=shOperator start=+\%(\\\)\@<!"+ skip=+\\"+ end=+"+ contains=@shDblQuoteList,shStringSpecial
++syn match shDerefString contained "\\["']" nextgroup=shDerefPattern
+
+ if exists("b:is_bash")
+ " bash : ${parameter:offset}
+@@ -478,9 +478,10 @@
+ hi def link shDerefVar shDeref
+ hi def link shDoubleQuote shString
+ hi def link shEcho shString
++hi def link shEchoQuote shString
+ hi def link shEmbeddedEcho shString
+ hi def link shExSingleQuote shSingleQuote
+-hi def link shFunctionStart Delimiter
++hi def link shFunction Function
+ hi def link shHereDoc shString
+ hi def link shHerePayload shHereDoc
+ hi def link shLoop shStatement
+@@ -541,7 +542,6 @@
+ hi def link shFunctionName Function
+ hi def link shNumber Number
+ hi def link shOperator Operator
+-hi def link shRepeat Repeat
+ hi def link shSet Statement
+ hi def link shSetList Identifier
+ hi def link shShellVariables PreProc
Modified: trunk/packages/vim/runtime/ftplugin/debchangelog.vim
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/runtime/ftplugin/debchangelog.vim?rev=1073&op=diff
==============================================================================
--- trunk/packages/vim/runtime/ftplugin/debchangelog.vim (original)
+++ trunk/packages/vim/runtime/ftplugin/debchangelog.vim Tue Oct 30 15:48:59 2007
@@ -109,9 +109,8 @@
call append(2, "")
call append(3, " -- ")
call append(4, "")
- call Distribution("unstable")
call Urgency("low")
- normal 1G
+ normal 1G0
call search(")")
normal h
normal
Added: trunk/packages/vim/upstream/patches/7.1.139
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.139?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.139 (added)
+++ trunk/packages/vim/upstream/patches/7.1.139 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.139
+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.139
+Problem: When using marker folding and ending Insert mode with CTRL-C the
+ current fold is truncated. (Fred Kater)
+Solution: Ignore got_int while updating folds.
+Files: src/fold.c
+
+
+*** ../vim-7.1.138/src/fold.c Thu May 10 21:02:13 2007
+--- src/fold.c Sun Oct 14 15:27:13 2007
+***************
+*** 858,864 ****
+--- 858,871 ----
+ || foldmethodIsDiff(wp)
+ #endif
+ || foldmethodIsSyntax(wp))
++ {
++ int save_got_int = got_int;
++
++ /* reset got_int here, otherwise it won't work */
++ got_int = FALSE;
+ foldUpdateIEMS(wp, top, bot);
++ got_int |= save_got_int;
++ }
+ }
+
+ /* foldUpdateAll() {{{2 */
+*** ../vim-7.1.138/src/version.c Tue Oct 9 10:46:39 2007
+--- src/version.c Sun Oct 14 15:31:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 139,
+ /**/
+
+--
+If Pacman had affected us as kids we'd be running around in dark rooms,
+munching pills and listening to repetitive music.
+ -- Marcus Brigstocke
+
+ /// 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.140
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.140?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.140 (added)
+++ trunk/packages/vim/upstream/patches/7.1.140 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.140
+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.140
+Problem: v:count is set only after typing a non-digit, that makes it
+ difficult to make a nice mapping.
+Solution: Set v:count while still typing the count.
+Files: src/normal.c
+
+
+*** ../vim-7.1.139/src/normal.c Thu Sep 13 18:25:08 2007
+--- src/normal.c Sun Oct 14 17:15:36 2007
+***************
+*** 690,695 ****
+--- 690,702 ----
+ ca.count0 = ca.count0 * 10 + (c - '0');
+ if (ca.count0 < 0) /* got too large! */
+ ca.count0 = 999999999L;
++ #ifdef FEAT_EVAL
++ /* Set v:count here, when called from main() and not a stuffed
++ * command, so that v:count can be used in an expression mapping
++ * right after the count. */
++ if (toplevel && stuff_empty())
++ set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
++ #endif
+ if (ctrl_w)
+ {
+ ++no_mapping;
+*** ../vim-7.1.139/src/version.c Sun Oct 14 15:32:10 2007
+--- src/version.c Sun Oct 14 17:13:15 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 140,
+ /**/
+
+--
+How To Keep A Healthy Level Of Insanity:
+11. Specify that your drive-through order is "to go".
+
+ /// 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.141
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.141?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.141 (added)
+++ trunk/packages/vim/upstream/patches/7.1.141 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,97 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.141
+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.141
+Problem: GTK: -geom argument doesn't support a negative offset.
+Solution: Compute position from the right/lower corner.
+Files: src/gui_gtk_x11.c
+
+
+*** ../vim-7.1.140/src/gui_gtk_x11.c Sat Sep 15 14:06:41 2007
+--- src/gui_gtk_x11.c Mon Oct 8 21:26:50 2007
+***************
+*** 4044,4049 ****
+--- 4044,4051 ----
+ unsigned int w, h;
+ int x = 0;
+ int y = 0;
++ guint pixel_width;
++ guint pixel_height;
+
+ mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
+
+***************
+*** 4055,4066 ****
+--- 4057,4087 ----
+ p_window = h - 1;
+ Rows = h;
+ }
++
++ pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
++ pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
++
++ #ifdef HAVE_GTK2
++ pixel_width += get_menu_tool_width();
++ pixel_height += get_menu_tool_height();
++ #endif
++
+ if (mask & (XValue | YValue))
++ {
++ int w, h;
++ gui_mch_get_screen_dimensions(&w, &h);
++ h += p_ghr + get_menu_tool_height();
++ w += get_menu_tool_width();
++ if (mask & XNegative)
++ x += w - pixel_width;
++ if (mask & YNegative)
++ y += h - pixel_height;
+ #ifdef HAVE_GTK2
+ gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
+ #else
+ gtk_widget_set_uposition(gui.mainwin, x, y);
+ #endif
++ }
+ vim_free(gui.geom);
+ gui.geom = NULL;
+
+***************
+*** 4071,4084 ****
+ */
+ if (gtk_socket_id != 0 && (mask & WidthValue || mask & HeightValue))
+ {
+- guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
+- guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
+-
+- #ifdef HAVE_GTK2
+- pixel_width += get_menu_tool_width();
+- pixel_height += get_menu_tool_height();
+- #endif
+-
+ update_window_manager_hints(pixel_width, pixel_height);
+ init_window_hints_state = 1;
+ g_timeout_add(1000, check_startup_plug_hints, NULL);
+--- 4092,4097 ----
+*** ../vim-7.1.140/src/version.c Sun Oct 14 17:15:45 2007
+--- src/version.c Fri Oct 19 14:28:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 141,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+35. Your husband tells you he's had the beard for 2 months.
+
+ /// 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.142
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.142?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.142 (added)
+++ trunk/packages/vim/upstream/patches/7.1.142 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,77 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.142
+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.142
+Problem: ":redir @A>" doesn't work.
+Solution: Ignore the extra ">" also when appending. (James Vega)
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.141/src/ex_docmd.c Sun Sep 30 14:00:41 2007
+--- src/ex_docmd.c Tue Oct 9 11:09:09 2007
+***************
+*** 8426,8446 ****
+ || *arg == '"')
+ {
+ redir_reg = *arg++;
+! if (*arg == '>' && arg[1] == '>')
+ arg += 2;
+! else if ((*arg == NUL || (*arg == '>' && arg[1] == NUL)) &&
+! (islower(redir_reg)
+! # ifdef FEAT_CLIPBOARD
+! || redir_reg == '*'
+! || redir_reg == '+'
+! # endif
+! || redir_reg == '"'))
+ {
+ if (*arg == '>')
+ arg++;
+!
+! /* make register empty */
+! write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
+ }
+ }
+ if (*arg != NUL)
+--- 8426,8442 ----
+ || *arg == '"')
+ {
+ redir_reg = *arg++;
+! if (*arg == '>' && arg[1] == '>') /* append */
+ arg += 2;
+! else
+ {
++ /* Can use both "@a" and "@a>". */
+ if (*arg == '>')
+ arg++;
+! /* Make register empty when not using @A- at Z and the
+! * command is valid. */
+! if (*arg == NUL && !isupper(redir_reg))
+! write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
+ }
+ }
+ if (*arg != NUL)
+*** ../vim-7.1.141/src/version.c Fri Oct 19 14:32:50 2007
+--- src/version.c Fri Oct 19 16:18:36 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 142,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+36. You miss more than five meals a week downloading the latest games from
+ Apogee.
+
+ /// 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.143
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.143?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.143 (added)
+++ trunk/packages/vim/upstream/patches/7.1.143 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.143
+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.143
+Problem: Uninitialized memory read when diffing three files. (Dominique
+ Pelle)
+Solution: Remove "+ !notset" so that we don't use fields that were not
+ computed.
+Files: src/diff.c
+
+
+*** ../vim-7.1.142/src/diff.c Sat Sep 29 14:15:00 2007
+--- src/diff.c Sun Oct 14 21:52:56 2007
+***************
+*** 1310,1316 ****
+ dp->df_count[idx_new] += -off;
+ off = 0;
+ }
+! for (i = idx_orig; i < idx_new + !notset; ++i)
+ if (curtab->tp_diffbuf[i] != NULL)
+ dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
+ - dp->df_lnum[i] + off;
+--- 1310,1316 ----
+ dp->df_count[idx_new] += -off;
+ off = 0;
+ }
+! for (i = idx_orig; i < idx_new; ++i)
+ if (curtab->tp_diffbuf[i] != NULL)
+ dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
+ - dp->df_lnum[i] + off;
+*** ../vim-7.1.142/src/version.c Fri Oct 19 16:20:09 2007
+--- src/version.c Fri Oct 19 17:32:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 143,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+37. You start looking for hot HTML addresses in public restrooms.
+
+ /// 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.144
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.144?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.144 (added)
+++ trunk/packages/vim/upstream/patches/7.1.144 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,46 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.144
+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.144
+Problem: After ":diffup" cursor can be in the wrong position.
+Solution: Force recomputing the cursor position.
+Files: src/diff.c
+
+
+*** ../vim-7.1.143/src/diff.c Fri Oct 19 17:32:58 2007
+--- src/diff.c Fri Oct 19 18:54:13 2007
+***************
+*** 791,796 ****
+--- 791,799 ----
+ }
+ mch_remove(tmp_orig);
+
++ /* force updating cursor position on screen */
++ curwin->w_valid_cursor.lnum = 0;
++
+ diff_redraw(TRUE);
+
+ theend:
+*** ../vim-7.1.143/src/version.c Fri Oct 19 17:32:58 2007
+--- src/version.c Fri Oct 19 18:56:49 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 144,
+ /**/
+
+--
+He who laughs last, thinks slowest.
+
+ /// 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.145
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.145?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.145 (added)
+++ trunk/packages/vim/upstream/patches/7.1.145 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,171 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.145
+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.145
+Problem: Insert mode completion: When using the popup menu, after
+ completing a word and typing a non-word character Vim is still
+ completing the same word, following CTRL-N doesn't work.
+ Insert mode Completion: When using CTRL-X O and there is only
+ "struct." before the cursor, typing one char to reduce the
+ matches, then BS completion stops.
+Solution: When typing a character that is not part of the item being
+ completed, stop complete mode. For whole line completion also
+ accept a space. For file name completion stop at a path
+ separator.
+ For omni completion stay in completion mode even if completing
+ with empty string.
+Files: src/edit.c
+
+
+*** ../vim-7.1.144/src/edit.c Thu Sep 13 18:25:08 2007
+--- src/edit.c Fri Oct 19 16:04:38 2007
+***************
+*** 129,134 ****
+--- 129,135 ----
+
+ static void ins_ctrl_x __ARGS((void));
+ static int has_compl_option __ARGS((int dict_opt));
++ static int ins_compl_accept_char __ARGS((int c));
+ static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup));
+ static int ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));
+ static void ins_compl_longest_match __ARGS((compl_T *match));
+***************
+*** 754,761 ****
+ continue;
+ }
+
+! /* A printable, non-white character: Add to "compl_leader". */
+! if (vim_isprintc(c) && !vim_iswhite(c))
+ {
+ ins_compl_addleader(c);
+ continue;
+--- 755,763 ----
+ continue;
+ }
+
+! /* A non-white character that fits in with the current
+! * completion: Add to "compl_leader". */
+! if (ins_compl_accept_char(c))
+ {
+ ins_compl_addleader(c);
+ continue;
+***************
+*** 2053,2058 ****
+--- 2055,2094 ----
+ }
+
+ /*
++ * Return TRUE when character "c" is part of the item currently being
++ * completed. Used to decide whether to abandon complete mode when the menu
++ * is visible.
++ */
++ static int
++ ins_compl_accept_char(c)
++ int c;
++ {
++ if (ctrl_x_mode & CTRL_X_WANT_IDENT)
++ /* When expanding an identifier only accept identifier chars. */
++ return vim_isIDc(c);
++
++ switch (ctrl_x_mode)
++ {
++ case CTRL_X_FILES:
++ /* When expanding file name only accept file name chars. But not
++ * path separators, so that "proto/<Tab>" expands files in
++ * "proto", not "proto/" as a whole */
++ return vim_isfilec(c) && !vim_ispathsep(c);
++
++ case CTRL_X_CMDLINE:
++ case CTRL_X_OMNI:
++ /* Command line and Omni completion can work with just about any
++ * printable character, but do stop at white space. */
++ return vim_isprintc(c) && !vim_iswhite(c);
++
++ case CTRL_X_WHOLE_LINE:
++ /* For while line completion a space can be part of the line. */
++ return vim_isprintc(c);
++ }
++ return vim_iswordc(c);
++ }
++
++ /*
+ * This is like ins_compl_add(), but if 'ic' and 'inf' are set, then the
+ * case of the originally typed text is used, and the case of the completed
+ * text is inferred, ie this tries to work out what case you probably wanted
+***************
+*** 3128,3135 ****
+ p = line + curwin->w_cursor.col;
+ mb_ptr_back(line, p);
+
+! /* Stop completion when the whole word was deleted. */
+! if ((int)(p - line) - (int)compl_col <= 0)
+ return K_BS;
+
+ /* Deleted more than what was used to find matches or didn't finish
+--- 3164,3174 ----
+ p = line + curwin->w_cursor.col;
+ mb_ptr_back(line, p);
+
+! /* Stop completion when the whole word was deleted. For Omni completion
+! * allow the word to be deleted, we won't match everything. */
+! if ((int)(p - line) - (int)compl_col < 0
+! || ((int)(p - line) - (int)compl_col == 0
+! && (ctrl_x_mode & CTRL_X_OMNI) == 0))
+ return K_BS;
+
+ /* Deleted more than what was used to find matches or didn't finish
+***************
+*** 4591,4604 ****
+ curs_col = curwin->w_cursor.col;
+ compl_pending = 0;
+
+! /* if this same ctrl_x_mode has been interrupted use the text from
+ * "compl_startpos" to the cursor as a pattern to add a new word
+ * instead of expand the one before the cursor, in word-wise if
+! * "compl_startpos"
+! * is not in the same line as the cursor then fix it (the line has
+! * been split because it was longer than 'tw'). if SOL is set then
+! * skip the previous pattern, a word at the beginning of the line has
+! * been inserted, we'll look for that -- Acevedo. */
+ if ((compl_cont_status & CONT_INTRPT) == CONT_INTRPT
+ && compl_cont_mode == ctrl_x_mode)
+ {
+--- 4630,4642 ----
+ curs_col = curwin->w_cursor.col;
+ compl_pending = 0;
+
+! /* If this same ctrl_x_mode has been interrupted use the text from
+ * "compl_startpos" to the cursor as a pattern to add a new word
+ * instead of expand the one before the cursor, in word-wise if
+! * "compl_startpos" is not in the same line as the cursor then fix it
+! * (the line has been split because it was longer than 'tw'). if SOL
+! * is set then skip the previous pattern, a word at the beginning of
+! * the line has been inserted, we'll look for that -- Acevedo. */
+ if ((compl_cont_status & CONT_INTRPT) == CONT_INTRPT
+ && compl_cont_mode == ctrl_x_mode)
+ {
+*** ../vim-7.1.144/src/version.c Fri Oct 19 18:57:33 2007
+--- src/version.c Fri Oct 19 20:38:21 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 145,
+ /**/
+
+--
+Micro$oft: where do you want to go today?
+ Linux: where do you want to go tomorrow?
+ FreeBSD: are you guys coming, or what?
+
+ /// 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.146
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.146?rev=1073&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.146 (added)
+++ trunk/packages/vim/upstream/patches/7.1.146 Tue Oct 30 15:48:59 2007
@@ -1,0 +1,92 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.146 (extra)
+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.146 (extra)
+Problem: VMS: Files with a very rare record organization (VFC) cannot be
+ properly written by Vim.
+ On older VAX systems mms runs into a syntax error.
+Solution: Check for this special situation. Do not wrap a comment, make it
+ one long line. (Zoltan Arpadffy)
+Files: src/fileio.c, src/Make_vms.mms
+
+
+*** ../vim-7.1.145/src/fileio.c Wed Oct 3 12:49:24 2007
+--- src/fileio.c Mon Oct 22 21:10:00 2007
+***************
+*** 4251,4257 ****
+ * they don't it adds one.
+ * With other RMS structures it works perfect without this fix.
+ */
+! if ((buf->b_fab_rat & (FAB$M_FTN | FAB$M_CR)) != 0)
+ {
+ int b2write;
+
+--- 4252,4259 ----
+ * they don't it adds one.
+ * With other RMS structures it works perfect without this fix.
+ */
+! if (buf->b_fab_rfm == FAB$C_VFC
+! || ((buf->b_fab_rat & (FAB$M_FTN | FAB$M_CR)) != 0))
+ {
+ int b2write;
+
+*** ../vim-7.1.145/src/Make_vms.mms Thu May 10 20:47:35 2007
+--- src/Make_vms.mms Mon Oct 22 21:13:08 2007
+***************
+*** 2,8 ****
+ # Makefile for Vim on OpenVMS
+ #
+ # Maintainer: Zoltan Arpadffy <arpadffy at polarhome.com>
+! # Last change: 2007 May 07
+ #
+ # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+ # with MMS and MMK
+--- 2,8 ----
+ # Makefile for Vim on OpenVMS
+ #
+ # Maintainer: Zoltan Arpadffy <arpadffy at polarhome.com>
+! # Last change: 2007 Oct 22
+ #
+ # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+ # with MMS and MMK
+***************
+*** 96,103 ****
+
+ .IFDEF MMSVAX
+ .IFDEF DECC # VAX with DECC
+! CC_DEF = cc # /decc # some system requires this switch
+! # but when it is not required /ver might fail
+ PREFIX = /prefix=all
+ .ELSE # VAX with VAXC
+ CC_DEF = cc
+--- 96,102 ----
+
+ .IFDEF MMSVAX
+ .IFDEF DECC # VAX with DECC
+! CC_DEF = cc # /decc # some system requires this switch but when it is not required /ver might fail
+ PREFIX = /prefix=all
+ .ELSE # VAX with VAXC
+ CC_DEF = cc
+*** ../vim-7.1.145/src/version.c Fri Oct 19 20:39:56 2007
+--- src/version.c Mon Oct 29 22:36:20 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 146,
+ /**/
+
+--
+Be thankful to be in a traffic jam, because it means you own a car.
+
+ /// 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