r1053 - in /trunk/packages/vim: debian/ patches/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Oct 3 14:10:07 UTC 2007
Author: jamessan
Date: Wed Oct 3 14:10:07 2007
New Revision: 1053
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1053
Log:
Upstream patches 127 - 135.
Updated tex.vim-syntax_additions.diff from Martin Krafft.
Added:
trunk/packages/vim/upstream/patches/7.1.127
trunk/packages/vim/upstream/patches/7.1.128
trunk/packages/vim/upstream/patches/7.1.129
trunk/packages/vim/upstream/patches/7.1.130
trunk/packages/vim/upstream/patches/7.1.131
trunk/packages/vim/upstream/patches/7.1.132
trunk/packages/vim/upstream/patches/7.1.133
trunk/packages/vim/upstream/patches/7.1.134
trunk/packages/vim/upstream/patches/7.1.135
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/tex.vim-syntax_additions.diff
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1053&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Oct 3 14:10:07 2007
@@ -155,3 +155,12 @@
2599 7.1.124 (extra) Mac: may get empty buffer if dropping file on Vim.app
12060 7.1.125 the TermResponse autocommand event is not always triggered
13372 7.1.126 (extra) ":vimgrep */*" doesn't work if autocmd changes dir
+ 2319 7.1.127 memory leak when doing completing
+ 2079 7.1.128 (extra) build problem with Cygwin
+ 1740 7.1.129 (extra) Win32: Can't get long user name
+ 9494 7.1.130 crash with some combination of undo and redo
+ 1535 7.1.131 ":mksession" always adds ":setlocal autoread"
+ 1781 7.1.132 getpos("'>") may return < 0 for a Linewise selection
+ 1515 7.1.133 shorten_fname1() linked when it's not needed
+ 10379 7.1.134 (extra) Win32: Can't build with VC8
+ 3337 7.1.135 Win32: ":e c:/tmp/foo" and ":e c:/tmp//foo" create two buffers
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1053&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Oct 3 14:10:07 2007
@@ -1,7 +1,7 @@
-vim (1:7.1-126+1) UNRELEASED; urgency=low
+vim (1:7.1-135+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (057 - 126), see README.gz for details.
+ * New upstream patches (057 - 135), see README.gz for details.
- Patch 125 corrects Vim's TermResponse autocmd behavior.
(Closes: #436452)
@@ -27,7 +27,7 @@
* Add tex.vim-syntax_additions.diff, which adds syntax highlighting for
acronyms, URLs, and citetest. (Closes: #444411, #444408, #444301)
- -- James Vega <jamessan at debian.org> Sun, 30 Sep 2007 13:21:36 -0400
+ -- James Vega <jamessan at debian.org> Wed, 03 Oct 2007 09:25:12 -0400
vim (1:7.1-056+2) unstable; urgency=low
Modified: trunk/packages/vim/patches/tex.vim-syntax_additions.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/tex.vim-syntax_additions.diff?rev=1053&op=diff
==============================================================================
--- trunk/packages/vim/patches/tex.vim-syntax_additions.diff (original)
+++ trunk/packages/vim/patches/tex.vim-syntax_additions.diff Wed Oct 3 14:10:07 2007
@@ -2,6 +2,23 @@
===================================================================
--- vim/runtime/syntax/tex.vim.orig
+++ vim/runtime/syntax/tex.vim
+@@ -96,13 +96,13 @@
+
+ " Clusters: {{{1
+ " --------
+-syn cluster texCmdGroup contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSectionMarker,texSectionName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle
++syn cluster texCmdGroup contains=texCmdBody,texComment,texDefParm,texDelimiter,texDocType,texInput,texLength,texLigature,texMathDelim,texMathOper,texNewCmd,texNewEnv,texRefZone,texSection,texSectionMarker,texSectionName,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texURLZone,texAcroZone
+ if !exists("g:tex_no_error")
+ syn cluster texCmdGroup add=texMathError
+ endif
+ syn cluster texEnvGroup contains=texMatcher,texMathDelim,texSpecialChar,texStatement
+-syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone, at texMathZones,texTitle,texAbstract
++syn cluster texFoldGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texSectionMarker,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone, at texMathZones,texTitle,texAbstract,texURLZone,texAcroZone
+-syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption, at Spell
++syn cluster texMatchGroup contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texURLZone,texAcroZone, at Spell
+ syn cluster texRefGroup contains=texMatcher,texComment,texDelimiter
+ if !exists("tex_no_math")
+ syn cluster texMathZones contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ
@@ -125,6 +125,8 @@
syn cluster texSubSubSectionGroup contains=texParaZone
syn cluster texParaGroup contains=texSubParaZone
@@ -27,14 +44,30 @@
syn match texDefParm contained "#\d\+"
+" Tex URL Zones: {{{1
-+syn region texURLZone matchgroup=texStatement start="\\\%(url\|href\){" end="}\|%stopzone\>" contains=@texURLGroup
-+syn region texURLZone matchgroup=texStatement start="\\burl\%(alt\)\={" end="}\|%stopzone\>" contains=@texURLGroup
-+syn region texURLZone matchgroup=texStatement start="\\\%(link\|email\){" end="}\|%stopzone\>" contains=@texURLGroup
++syn region texURLZone matchgroup=texURLZone start="\\\%(url\|href\){" end="}\|%stopzone\>" contains=@texURLGroup
++syn region texURLZone matchgroup=texURLZone start="\\burl\%(alt\)\={" end="}\|%stopzone\>" contains=@texURLGroup
++syn region texURLZone matchgroup=texURLZone start="\\\%(link\|email\){" end="}\|%stopzone\>" contains=@texURLGroup
+
-+" Tex Acronyms: {{{1
-+syn region texAcronym matchgroup=texStatement start="\\ac\%(fi\|[fls]\=p\=\)\*\={" end="}\|%stopzone\>" contains=@texAcroGroup
-+syn region texAcronym matchgroup=texStatement start="\\ac\%(used\|[ls]u\*\=\){" end="}\|%stopzone\>" contains=@texAcroGroup
++" Tex Acronym Zones: {{{1
++syn region texAcroZone matchgroup=texAcroZone start="\\ac\%(fi\|[fls]\=p\=\)\*\={" end="}\|%stopzone\>" contains=@texAcroGroup
++syn region texAcroZone matchgroup=texAcroZone start="\\ac\%(used\|[ls]u\*\=\){" end="}\|%stopzone\>" contains=@texAcroGroup
+
" TeX Lengths: {{{1
syn match texLength "\<\d\+\([.,]\d\+\)\=\s*\(true\)\=\s*\(bp\|cc\|cm\|dd\|em\|ex\|in\|mm\|pc\|pt\|sp\)\>"
+@@ -510,6 +523,7 @@
+ HiLink texTypeStyle texType
+
+ " Basic TeX highlighting groups
++ HiLink texAcroZone Special
+ HiLink texCmdArgs Number
+ HiLink texCmdName Statement
+ HiLink texComment Comment
+@@ -533,6 +547,7 @@
+ HiLink texString String
+ HiLink texTodo Todo
+ HiLink texType Type
++ HiLink texURLZone Special
+ HiLink texZone PreCondit
+
+ delcommand HiLink
Added: trunk/packages/vim/upstream/patches/7.1.127
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.127?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.127 (added)
+++ trunk/packages/vim/upstream/patches/7.1.127 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,78 @@
+To: vim-dev at vim.org
+Subject: About patch 7.1.127
+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.127
+Problem: Memory leak when doing cmdline completion. (Dominique Pelle)
+Solution: Free "orig" argument of ExpandOne() when it's not used.
+Files: src/ex_getln.c
+
+
+*** ../vim-7.1.126/src/ex_getln.c Sat Sep 29 14:15:00 2007
+--- src/ex_getln.c Sun Sep 30 17:55:47 2007
+***************
+*** 3316,3321 ****
+--- 3316,3325 ----
+ * Return a pointer to alloced memory containing the new string.
+ * Return NULL for failure.
+ *
++ * "orig" is the originally expanded string, copied to allocated memory. It
++ * should either be kept in orig_save or freed. When "mode" is WILD_NEXT or
++ * WILD_PREV "orig" should be NULL.
++ *
+ * Results are cached in xp->xp_files and xp->xp_numfiles, except when "mode"
+ * is WILD_EXPAND_FREE or WILD_ALL.
+ *
+***************
+*** 3400,3406 ****
+ return NULL;
+ }
+
+! /* free old names */
+ if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST)
+ {
+ FreeWild(xp->xp_numfiles, xp->xp_files);
+--- 3404,3410 ----
+ return NULL;
+ }
+
+! /* free old names */
+ if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST)
+ {
+ FreeWild(xp->xp_numfiles, xp->xp_files);
+***************
+*** 3540,3545 ****
+--- 3544,3553 ----
+
+ if (mode == WILD_EXPAND_FREE || mode == WILD_ALL)
+ ExpandCleanup(xp);
++
++ /* Free "orig" if it wasn't stored in "orig_save". */
++ if (orig != orig_save)
++ vim_free(orig);
+
+ return ss;
+ }
+*** ../vim-7.1.126/src/version.c Sun Sep 30 14:00:41 2007
+--- src/version.c Sun Sep 30 14:20:14 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 127,
+ /**/
+
+--
+A M00se once bit my sister ...
+ "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.128
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.128?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.128 (added)
+++ trunk/packages/vim/upstream/patches/7.1.128 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,67 @@
+To: vim-dev at vim.org
+Subject: About patch 7.1.128 (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.128 (extra)
+Problem: Build problems with new version of Cygwin.
+Solution: Remove -D__IID_DEFINED__, like with MingW. (Guopeng Wen)
+Files: src/Make_cyg.mak
+
+
+*** ../vim-7.1.127/src/Make_cyg.mak Sun Apr 30 20:46:49 2006
+--- src/Make_cyg.mak Sat Sep 29 13:09:34 2007
+***************
+*** 1,6 ****
+ #
+ # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp. Last Change: 2006 Apr 30
+ #
+ # Also read INSTALLpc.txt!
+ #
+--- 1,6 ----
+ #
+ # Makefile for VIM on Win32, using Cygnus gcc
+! # Last updated by Dan Sharp. Last Change: 2007 Sep 29
+ #
+ # Also read INSTALLpc.txt!
+ #
+***************
+*** 503,509 ****
+ $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
+
+ $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
+! $(CC) -c $(CFLAGS) -D__IID_DEFINED__ if_ole.cpp -o $(OUTDIR)/if_ole.o
+
+ if_perl.c: if_perl.xs typemap
+ $(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
+--- 503,509 ----
+ $(CC) -c $(CFLAGS) if_cscope.c -o $(OUTDIR)/if_cscope.o
+
+ $(OUTDIR)/if_ole.o: if_ole.cpp $(INCL)
+! $(CC) -c $(CFLAGS) if_ole.cpp -o $(OUTDIR)/if_ole.o
+
+ if_perl.c: if_perl.xs typemap
+ $(PERL)/bin/perl `cygpath -d $(PERL)/lib/ExtUtils/xsubpp` \
+*** ../vim-7.1.127/src/version.c Sun Sep 30 22:10:45 2007
+--- src/version.c Sun Sep 30 22:27:51 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 128,
+ /**/
+
+--
+Mynd you, m00se bites Kan be pretty nasti ...
+ "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.129
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.129?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.129 (added)
+++ trunk/packages/vim/upstream/patches/7.1.129 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,56 @@
+To: vim-dev at vim.org
+Subject: About patch 7.1.129 (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.129 (extra)
+Problem: Win32: Can't get the user name when it is longer than 15
+ characters.
+Solution: Use UNLEN instead of MAX_COMPUTERNAME_LENGTH. (Alexei Alexandrov)
+Files: src/os_win32.c
+
+
+*** ../vim-7.1.128/src/os_win32.c Thu May 10 19:22:59 2007
+--- src/os_win32.c Mon Oct 1 20:07:24 2007
+***************
+*** 2378,2384 ****
+ char_u *s,
+ int len)
+ {
+! char szUserName[MAX_COMPUTERNAME_LENGTH + 1];
+ DWORD cch = sizeof szUserName;
+
+ if (GetUserName(szUserName, &cch))
+--- 2378,2384 ----
+ char_u *s,
+ int len)
+ {
+! char szUserName[256 + 1]; /* UNLEN is 256 */
+ DWORD cch = sizeof szUserName;
+
+ if (GetUserName(szUserName, &cch))
+*** ../vim-7.1.128/src/version.c Sun Sep 30 22:28:08 2007
+--- src/version.c Mon Oct 1 20:32:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 129,
+ /**/
+
+--
+ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of Camelot.
+ King of all Britons, defeator of the Saxons, sovereign of all England!
+ [Pause]
+SOLDIER: Get away!
+ "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.130
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.130?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.130 (added)
+++ trunk/packages/vim/upstream/patches/7.1.130 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,363 @@
+To: vim-dev at vim.org
+Subject: About patch 7.1.130
+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.130
+Problem: Crash with specific order of undo and redo. (A.Politz)
+Solution: Clear and adjust pointers properly. Add u_check() for debugging.
+Files: src/undo.c, src/structs.h
+
+
+*** ../vim-7.1.129/src/undo.c Thu May 10 20:01:43 2007
+--- src/undo.c Mon Oct 1 22:49:16 2007
+***************
+*** 76,81 ****
+--- 76,87 ----
+ * buffer is unloaded.
+ */
+
++ /* Uncomment the next line for including the u_check() function. This warns
++ * for errors in the debug information. */
++ /* #define U_DEBUG 1 */
++ #define UH_MAGIC 0x18dade /* value for uh_magic when in use */
++ #define UE_MAGIC 0xabc123 /* value for ue_magic when in use */
++
+ #include "vim.h"
+
+ /* See below: use malloc()/free() for memory management. */
+***************
+*** 113,118 ****
+--- 119,213 ----
+ */
+ static int undo_undoes = FALSE;
+
++ #ifdef U_DEBUG
++ /*
++ * Check the undo structures for being valid. Print a warning when something
++ * looks wrong.
++ */
++ static int seen_b_u_curhead;
++ static int seen_b_u_newhead;
++ static int header_count;
++
++ static void
++ u_check_tree(u_header_T *uhp,
++ u_header_T *exp_uh_next,
++ u_header_T *exp_uh_alt_prev)
++ {
++ u_entry_T *uep;
++
++ if (uhp == NULL)
++ return;
++ ++header_count;
++ if (uhp == curbuf->b_u_curhead && ++seen_b_u_curhead > 1)
++ {
++ EMSG("b_u_curhead found twice (looping?)");
++ return;
++ }
++ if (uhp == curbuf->b_u_newhead && ++seen_b_u_newhead > 1)
++ {
++ EMSG("b_u_newhead found twice (looping?)");
++ return;
++ }
++
++ if (uhp->uh_magic != UH_MAGIC)
++ EMSG("uh_magic wrong (may be using freed memory)");
++ else
++ {
++ /* Check pointers back are correct. */
++ if (uhp->uh_next != exp_uh_next)
++ {
++ EMSG("uh_next wrong");
++ smsg((char_u *)"expected: 0x%x, actual: 0x%x",
++ exp_uh_next, uhp->uh_next);
++ }
++ if (uhp->uh_alt_prev != exp_uh_alt_prev)
++ {
++ EMSG("uh_alt_prev wrong");
++ smsg((char_u *)"expected: 0x%x, actual: 0x%x",
++ exp_uh_alt_prev, uhp->uh_alt_prev);
++ }
++
++ /* Check the undo tree at this header. */
++ for (uep = uhp->uh_entry; uep != NULL; uep = uep->ue_next)
++ {
++ if (uep->ue_magic != UE_MAGIC)
++ {
++ EMSG("ue_magic wrong (may be using freed memory)");
++ break;
++ }
++ }
++
++ /* Check the next alt tree. */
++ u_check_tree(uhp->uh_alt_next, uhp->uh_next, uhp);
++
++ /* Check the next header in this branch. */
++ u_check_tree(uhp->uh_prev, uhp, NULL);
++ }
++ }
++
++ void
++ u_check(int newhead_may_be_NULL)
++ {
++ seen_b_u_newhead = 0;
++ seen_b_u_curhead = 0;
++ header_count = 0;
++
++ u_check_tree(curbuf->b_u_oldhead, NULL, NULL);
++
++ if (seen_b_u_newhead == 0 && curbuf->b_u_oldhead != NULL
++ && !(newhead_may_be_NULL && curbuf->b_u_newhead == NULL))
++ EMSGN("b_u_newhead invalid: 0x%x", curbuf->b_u_newhead);
++ if (curbuf->b_u_curhead != NULL && seen_b_u_curhead == 0)
++ EMSGN("b_u_curhead invalid: 0x%x", curbuf->b_u_curhead);
++ if (header_count != curbuf->b_u_numhead)
++ {
++ EMSG("b_u_numhead invalid");
++ smsg((char_u *)"expected: %ld, actual: %ld",
++ (long)header_count, (long)curbuf->b_u_numhead);
++ }
++ }
++ #endif
++
+ /*
+ * Save the current line for both the "u" and "U" command.
+ * Returns OK or FAIL.
+***************
+*** 243,248 ****
+--- 338,346 ----
+ if (!undo_allowed())
+ return FAIL;
+
++ #ifdef U_DEBUG
++ u_check(FALSE);
++ #endif
+ #ifdef FEAT_NETBEANS_INTG
+ /*
+ * Netbeans defines areas that cannot be modified. Bail out here when
+***************
+*** 294,299 ****
+--- 392,400 ----
+ uhp = (u_header_T *)U_ALLOC_LINE((unsigned)sizeof(u_header_T));
+ if (uhp == NULL)
+ goto nomem;
++ #ifdef U_DEBUG
++ uhp->uh_magic = UH_MAGIC;
++ #endif
+ }
+ else
+ uhp = NULL;
+***************
+*** 316,323 ****
+ {
+ u_header_T *uhfree = curbuf->b_u_oldhead;
+
+! /* If there is no branch only free one header. */
+! if (uhfree->uh_alt_next == NULL)
+ u_freeheader(curbuf, uhfree, &old_curhead);
+ else
+ {
+--- 417,427 ----
+ {
+ u_header_T *uhfree = curbuf->b_u_oldhead;
+
+! if (uhfree == old_curhead)
+! /* Can't reconnect the branch, delete all of it. */
+! u_freebranch(curbuf, uhfree, &old_curhead);
+! else if (uhfree->uh_alt_next == NULL)
+! /* There is no branch, only free one header. */
+ u_freeheader(curbuf, uhfree, &old_curhead);
+ else
+ {
+***************
+*** 326,331 ****
+--- 430,438 ----
+ uhfree = uhfree->uh_alt_next;
+ u_freebranch(curbuf, uhfree, &old_curhead);
+ }
++ #ifdef U_DEBUG
++ u_check(TRUE);
++ #endif
+ }
+
+ if (uhp == NULL) /* no undo at all */
+***************
+*** 478,483 ****
+--- 585,593 ----
+ uep = (u_entry_T *)U_ALLOC_LINE((unsigned)sizeof(u_entry_T));
+ if (uep == NULL)
+ goto nomem;
++ #ifdef U_DEBUG
++ uep->ue_magic = UE_MAGIC;
++ #endif
+
+ uep->ue_size = size;
+ uep->ue_top = top;
+***************
+*** 525,530 ****
+--- 635,643 ----
+ curbuf->b_u_synced = FALSE;
+ undo_undoes = FALSE;
+
++ #ifdef U_DEBUG
++ u_check(FALSE);
++ #endif
+ return OK;
+
+ nomem:
+***************
+*** 955,960 ****
+--- 1068,1076 ----
+ int empty_buffer; /* buffer became empty */
+ u_header_T *curhead = curbuf->b_u_curhead;
+
++ #ifdef U_DEBUG
++ u_check(FALSE);
++ #endif
+ old_flags = curhead->uh_flags;
+ new_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
+ ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
+***************
+*** 1186,1191 ****
+--- 1302,1310 ----
+ /* The timestamp can be the same for multiple changes, just use the one of
+ * the undone/redone change. */
+ curbuf->b_u_seq_time = curhead->uh_time;
++ #ifdef U_DEBUG
++ u_check(FALSE);
++ #endif
+ }
+
+ /*
+***************
+*** 1515,1521 ****
+ }
+
+ /*
+! * Free one header and its entry list and adjust the pointers.
+ */
+ static void
+ u_freeheader(buf, uhp, uhpp)
+--- 1634,1640 ----
+ }
+
+ /*
+! * Free one header "uhp" and its entry list and adjust the pointers.
+ */
+ static void
+ u_freeheader(buf, uhp, uhpp)
+***************
+*** 1523,1528 ****
+--- 1642,1649 ----
+ u_header_T *uhp;
+ u_header_T **uhpp; /* if not NULL reset when freeing this header */
+ {
++ u_header_T *uhap;
++
+ /* When there is an alternate redo list free that branch completely,
+ * because we can never go there. */
+ if (uhp->uh_alt_next != NULL)
+***************
+*** 1540,1546 ****
+ if (uhp->uh_prev == NULL)
+ buf->b_u_newhead = uhp->uh_next;
+ else
+! uhp->uh_prev->uh_next = uhp->uh_next;
+
+ u_freeentries(buf, uhp, uhpp);
+ }
+--- 1661,1668 ----
+ if (uhp->uh_prev == NULL)
+ buf->b_u_newhead = uhp->uh_next;
+ else
+! for (uhap = uhp->uh_prev; uhap != NULL; uhap = uhap->uh_alt_next)
+! uhap->uh_next = uhp->uh_next;
+
+ u_freeentries(buf, uhp, uhpp);
+ }
+***************
+*** 1585,1590 ****
+--- 1707,1714 ----
+ /* Check for pointers to the header that become invalid now. */
+ if (buf->b_u_curhead == uhp)
+ buf->b_u_curhead = NULL;
++ if (buf->b_u_newhead == uhp)
++ buf->b_u_newhead = NULL; /* freeing the newest entry */
+ if (uhpp != NULL && uhp == *uhpp)
+ *uhpp = NULL;
+
+***************
+*** 1594,1599 ****
+--- 1718,1726 ----
+ u_freeentry(uep, uep->ue_size);
+ }
+
++ #ifdef U_DEBUG
++ uhp->uh_magic = 0;
++ #endif
+ U_FREE_LINE((char_u *)uhp);
+ --buf->b_u_numhead;
+ }
+***************
+*** 1609,1614 ****
+--- 1736,1744 ----
+ while (n > 0)
+ U_FREE_LINE(uep->ue_array[--n]);
+ U_FREE_LINE((char_u *)uep->ue_array);
++ #ifdef U_DEBUG
++ uep->ue_magic = 0;
++ #endif
+ U_FREE_LINE((char_u *)uep);
+ }
+
+*** ../vim-7.1.129/src/structs.h Sun Aug 12 15:50:26 2007
+--- src/structs.h Sat Sep 29 15:03:38 2007
+***************
+*** 278,283 ****
+--- 278,286 ----
+ linenr_T ue_lcount; /* linecount when u_save called */
+ char_u **ue_array; /* array of lines in undo block */
+ long ue_size; /* number of lines in ue_array */
++ #ifdef U_DEBUG
++ int ue_magic; /* magic number to check allocation */
++ #endif
+ };
+
+ struct u_header
+***************
+*** 300,305 ****
+--- 303,311 ----
+ visualinfo_T uh_visual; /* Visual areas before undo/after redo */
+ #endif
+ time_t uh_time; /* timestamp when the change was made */
++ #ifdef U_DEBUG
++ int uh_magic; /* magic number to check allocation */
++ #endif
+ };
+
+ /* values for uh_flags */
+*** ../vim-7.1.129/src/version.c Mon Oct 1 20:33:45 2007
+--- src/version.c Mon Oct 1 22:50:23 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 130,
+ /**/
+
+--
+FIRST SOLDIER: So they wouldn't be able to bring a coconut back anyway.
+SECOND SOLDIER: Wait a minute! Suppose two swallows carried it together?
+FIRST SOLDIER: No, they'd have to have it on a line.
+ "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.131
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.131?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.131 (added)
+++ trunk/packages/vim/upstream/patches/7.1.131 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,50 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.131
+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.131
+Problem: ":mksession" always adds ":setlocal autoread". (Christian J.
+ Robinson)
+Solution: Skip boolean global/local option using global value.
+Files: src/option.c
+
+
+*** ../vim-7.1.130/src/option.c Wed Sep 26 22:35:06 2007
+--- src/option.c Sun Sep 30 16:21:08 2007
+***************
+*** 8753,8758 ****
+--- 8753,8760 ----
+ char *name;
+ int value;
+ {
++ if (value < 0) /* global/local option using global value */
++ return OK;
+ if (fprintf(fd, "%s %s%s", cmd, value ? "" : "no", name) < 0
+ || put_eol(fd) < 0)
+ return FAIL;
+*** ../vim-7.1.130/src/version.c Mon Oct 1 22:53:27 2007
+--- src/version.c Tue Oct 2 20:39:02 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 131,
+ /**/
+
+--
+ARTHUR: Old woman!
+DENNIS: Man!
+ARTHUR: Man. I'm sorry. Old man, What knight live in that castle over there?
+DENNIS: I'm thirty-seven.
+ "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.132
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.132?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.132 (added)
+++ trunk/packages/vim/upstream/patches/7.1.132 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.132
+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.132
+Problem: getpos("'>") may return a negative column number for a Linewise
+ selection. (A.Politz)
+Solution: Don't add one to MAXCOL.
+Files: src/eval.c
+
+
+*** ../vim-7.1.131/src/eval.c Tue Sep 25 20:39:14 2007
+--- src/eval.c Mon Oct 1 20:56:09 2007
+***************
+*** 10388,10394 ****
+ list_append_number(l, (varnumber_T)0);
+ list_append_number(l, (fp != NULL) ? (varnumber_T)fp->lnum
+ : (varnumber_T)0);
+! list_append_number(l, (fp != NULL) ? (varnumber_T)fp->col + 1
+ : (varnumber_T)0);
+ list_append_number(l,
+ #ifdef FEAT_VIRTUALEDIT
+--- 10388,10395 ----
+ list_append_number(l, (varnumber_T)0);
+ list_append_number(l, (fp != NULL) ? (varnumber_T)fp->lnum
+ : (varnumber_T)0);
+! list_append_number(l, (fp != NULL)
+! ? (varnumber_T)(fp->col == MAXCOL ? MAXCOL : fp->col + 1)
+ : (varnumber_T)0);
+ list_append_number(l,
+ #ifdef FEAT_VIRTUALEDIT
+*** ../vim-7.1.131/src/version.c Tue Oct 2 20:40:01 2007
+--- src/version.c Tue Oct 2 22:07:17 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 132,
+ /**/
+
+--
+"The future's already arrived - it's just not evenly distributed yet."
+ -- William Gibson
+
+ /// 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.133
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.133?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.133 (added)
+++ trunk/packages/vim/upstream/patches/7.1.133 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,56 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.133
+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.133 (after 7.1.126)
+Problem: shorten_fname1() linked when it's not needed.
+Solution: Add #ifdef.
+Files: src/fileio.c
+
+
+*** ../vim-7.1.132/src/fileio.c Sun Sep 30 14:00:41 2007
+--- src/fileio.c Sun Sep 30 16:32:43 2007
+***************
+*** 5553,5558 ****
+--- 5554,5561 ----
+ }
+ #endif
+
++ #if defined(FEAT_VIMINFO) || defined(FEAT_BROWSE) || \
++ defined(FEAT_QUICKFIX) || defined(PROTO)
+ /*
+ * Try to find a shortname by comparing the fullname with the current
+ * directory.
+***************
+*** 5573,5578 ****
+--- 5576,5582 ----
+ }
+ return p;
+ }
++ #endif
+
+ /*
+ * Try to find a shortname by comparing the fullname with the current
+*** ../vim-7.1.132/src/version.c Tue Oct 2 22:07:58 2007
+--- src/version.c Wed Oct 3 12:46:59 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 133,
+ /**/
+
+--
+"Beware of bugs in the above code; I have only proved
+it correct, not tried it." -- Donald Knuth
+
+ /// 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.134
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.134?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.134 (added)
+++ trunk/packages/vim/upstream/patches/7.1.134 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,377 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.134 (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.134 (extra)
+Problem: Win32: Can't build with VC8
+Solution: Detect the MSVC version instead of using NMAKE_VER.
+ (Mike Williams)
+Files: src/Make_mvc.mak
+
+
+*** ../vim-7.1.133/src/Make_mvc.mak Tue Feb 20 03:15:08 2007
+--- src/Make_mvc.mak Mon Oct 1 21:37:20 2007
+***************
+*** 92,97 ****
+--- 92,99 ----
+ # Netbeans Debugging Support: NBDEBUG=[yes or no] (should be no, yes
+ # doesn't work)
+ #
++ # Visual C Version: MSVCVER=m.n (default derived from nmake if undefined)
++ #
+ # You can combine any of these interfaces
+ #
+ # Example: To build the non-debug, GUI version with Perl interface:
+***************
+*** 101,107 ****
+ # This makefile gives a fineness of control which is not supported in
+ # Visual C++ configuration files. Therefore, debugging requires a bit of
+ # extra work.
+! # Make_dvc.mak is a Visual C++ project to access that support.
+ # To use Make_dvc.mak:
+ # 1) Build Vim with Make_mvc.mak.
+ # Use a "DEBUG=yes" argument to build Vim with debug support.
+--- 103,110 ----
+ # This makefile gives a fineness of control which is not supported in
+ # Visual C++ configuration files. Therefore, debugging requires a bit of
+ # extra work.
+! # Make_dvc.mak is a Visual C++ project to access that support. It may be
+! # badly out of date for the Visual C++ you are using...
+ # To use Make_dvc.mak:
+ # 1) Build Vim with Make_mvc.mak.
+ # Use a "DEBUG=yes" argument to build Vim with debug support.
+***************
+*** 198,211 ****
+ !if "$(DEBUG)" != "yes"
+ NODEBUG = 1
+ !else
+ MAKEFLAGS_GVIMEXT = DEBUG=yes
+ !endif
+
+
+! # Get all sorts of useful, standard macros from the SDK. (Note that
+! # MSVC 2.2 does not install <ntwin32.mak> in the \msvc20\include
+! # directory, but you can find it in \msvc20\include on the CD-ROM.
+! # You may also need <win32.mak> from the same place.)
+
+ !include <Win32.mak>
+
+--- 201,212 ----
+ !if "$(DEBUG)" != "yes"
+ NODEBUG = 1
+ !else
++ !undef NODEBUG
+ MAKEFLAGS_GVIMEXT = DEBUG=yes
+ !endif
+
+
+! # Get all sorts of useful, standard macros from the Platform SDK.
+
+ !include <Win32.mak>
+
+***************
+*** 272,283 ****
+
+ # Set which version of the CRT to use
+ !if defined(USE_MSVCRT)
+! CVARS = $(cvarsdll)
+ # !elseif defined(MULTITHREADED)
+ # CVARS = $(cvarsmt)
+ !else
+ # CVARS = $(cvars)
+! CVARS = $(cvarsmt)
+ !endif
+
+ # need advapi32.lib for GetUserName()
+--- 273,284 ----
+
+ # Set which version of the CRT to use
+ !if defined(USE_MSVCRT)
+! # CVARS = $(cvarsdll)
+ # !elseif defined(MULTITHREADED)
+ # CVARS = $(cvarsmt)
+ !else
+ # CVARS = $(cvars)
+! # CVARS = $(cvarsmt)
+ !endif
+
+ # need advapi32.lib for GetUserName()
+***************
+*** 320,326 ****
+--- 321,364 ----
+ INTDIR=$(OBJDIR)
+ OUTDIR=$(OBJDIR)
+
++ # Derive version of VC being used from nmake if not specified
++ !if "$(MSVCVER)" == ""
++ !if "$(_NMAKE_VER)" == ""
++ MSVCVER = 4.0
++ !endif
++ !if "$(_NMAKE_VER)" == "162"
++ MSVCVER = 5.0
++ !endif
++ !if "$(_NMAKE_VER)" == "6.00.8168.0"
++ MSVCVER = 6.0
++ !endif
++ !if "$(_NMAKE_VER)" == "7.00.9466"
++ MSVCVER = 7.0
++ !endif
++ !if "$(_NMAKE_VER)" == "7.10.3077"
++ MSVCVER = 7.1
++ !endif
++ !if "$(_NMAKE_VER)" == "8.00.50727.42"
++ MSVCVER = 8.0
++ !endif
++ !if "$(_NMAKE_VER)" == "8.00.50727.762"
++ MSVCVER = 8.0
++ !endif
++ !endif
++
++ # Abort bulding VIM if version of VC is unrecognised.
++ !ifndef MSVCVER
++ !message *** ERROR
++ !message Cannot determine Visual C version being used. If you are using the
++ !message Windows SDK then you must have the environment variable MSVCVER set to
++ !message your version of the VC compiler. If you are not using the Express
++ !message version of Visual C you van either set MSVCVER or update this makefile
++ !message to handle the new value for _NMAKE_VER.
++ !error Make aborted.
++ !endif
++
+ # Convert processor ID to MVC-compatible number
++ !if "$(MSVCVER)" != "8.0"
+ !if "$(CPUNR)" == "i386"
+ CPUARG = /G3
+ !elseif "$(CPUNR)" == "i486"
+***************
+*** 334,339 ****
+--- 372,386 ----
+ !else
+ CPUARG =
+ !endif
++ !else
++ # VC8 only allows specifying SSE architecture
++ !if "$(CPUNR)" == "pentium4"
++ CPUARG = /arch:SSE2
++ !endif
++ !endif
++
++ LIBC =
++ DEBUGINFO = /Zi
+
+ !ifdef NODEBUG
+ VIM = vim
+***************
+*** 344,384 ****
+ !else # MAXSPEED
+ OPTFLAG = /Ox
+ !endif
+ CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
+ RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
+ ! ifdef USE_MSVCRT
+! CFLAGS = $(CFLAGS) -MD
+ LIBC = msvcrt.lib
+- # CFLAGS = $(CFLAGS) $(cvarsdll)
+- # ! elseif defined(MULTITHREADED)
+- # LIBC = libcmt.lib
+- # CFLAGS = $(CFLAGS) $(cvarsmt)
+ ! else
+- # LIBC = libc.lib
+ LIBC = libcmt.lib
+! # CFLAGS = $(CFLAGS) $(cvars)
+ ! endif
+ !else # DEBUG
+ VIM = vimd
+ CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
+ RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
+ # The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
+! ! if "$(_NMAKE_VER)" == ""
+ LIBC =
+ ! else
+ LIBC = /fixed:no
+ ! endif
+ ! ifdef USE_MSVCRT
+! CFLAGS = $(CFLAGS) -MDd
+ LIBC = $(LIBC) msvcrtd.lib
+- # CFLAGS = $(CFLAGS) $(cvarsdll)
+- # ! elseif defined(MULTITHREADED)
+- # LIBC = $(LIBC) libcmtd.lib
+- # CFLAGS = $(CFLAGS) $(cvarsmt)
+ ! else
+- # LIBC = $(LIBC) libcd.lib
+ LIBC = $(LIBC) libcmtd.lib
+! # CFLAGS = $(CFLAGS) $(cvars)
+ ! endif
+ !endif # DEBUG
+
+--- 391,430 ----
+ !else # MAXSPEED
+ OPTFLAG = /Ox
+ !endif
++ !if "$(MSVCVER)" == "8.0"
++ # Use link time code generation if not worried about size
++ !if "$(OPTIMIZE)" != "SPACE"
++ OPTFLAG = $(OPTFLAG) /GL
++ !endif
++ !endif
+ CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
+ RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
+ ! ifdef USE_MSVCRT
+! CFLAGS = $(CFLAGS) /MD
+ LIBC = msvcrt.lib
+ ! else
+ LIBC = libcmt.lib
+! CFLAGS = $(CFLAGS) /MT
+ ! endif
+ !else # DEBUG
+ VIM = vimd
++ ! if "$(CPU)" == "i386"
++ DEBUGINFO = /ZI
++ ! endif
+ CFLAGS = $(CFLAGS) -D_DEBUG -DDEBUG /Od
+ RCFLAGS = $(rcflags) $(rcvars) -D_DEBUG -DDEBUG
+ # The /fixed:no is needed for Quantify. Assume not 4.? as unsupported in VC4.0.
+! ! if "$(MSVCVER)" == "4.0"
+ LIBC =
+ ! else
+ LIBC = /fixed:no
+ ! endif
+ ! ifdef USE_MSVCRT
+! CFLAGS = $(CFLAGS) /MDd
+ LIBC = $(LIBC) msvcrtd.lib
+ ! else
+ LIBC = $(LIBC) libcmtd.lib
+! CFLAGS = $(CFLAGS) /MTd
+ ! endif
+ !endif # DEBUG
+
+***************
+*** 681,696 ****
+ #
+ # Always generate the .pdb file, so that we get debug symbols that can be used
+ # on a crash (doesn't add overhead to the executable).
+ #
+! CFLAGS = $(CFLAGS) /Zi /Fd$(OUTDIR)/
+! LINK_PDB = /PDB:$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup
+
+ #
+ # End extra feature include
+ #
+ !message
+
+! conflags = /nologo /subsystem:$(SUBSYSTEM) /incremental:no
+
+ PATHDEF_SRC = $(OUTDIR)\pathdef.c
+
+--- 727,744 ----
+ #
+ # Always generate the .pdb file, so that we get debug symbols that can be used
+ # on a crash (doesn't add overhead to the executable).
++ # Generate edit-and-continue debug info when no optimization - allows to
++ # debug more conveniently (able to look at variables which are in registers)
+ #
+! CFLAGS = $(CFLAGS) /Fd$(OUTDIR)/ $(DEBUGINFO)
+! LINK_PDB = /PDB:$(VIM).pdb -debug
+
+ #
+ # End extra feature include
+ #
+ !message
+
+! conflags = /nologo /subsystem:$(SUBSYSTEM)
+
+ PATHDEF_SRC = $(OUTDIR)\pathdef.c
+
+***************
+*** 702,712 ****
+ conflags = $(conflags) /map /mapinfo:lines
+ !ENDIF
+
+! LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc
+ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
+ $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
+ $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
+
+ all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
+ GvimExt/gvimext.dll
+
+--- 750,769 ----
+ conflags = $(conflags) /map /mapinfo:lines
+ !ENDIF
+
+! LINKARGS1 = $(linkdebug) $(conflags)
+ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
+ $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
+ $(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
+
++ # Report link time code generation progress if used.
++ !ifdef NODEBUG
++ !if "$(MSVCVER)" == "8.0"
++ !if "$(OPTIMIZE)" != "SPACE"
++ LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
++ !endif
++ !endif
++ !endif
++
+ all: $(VIM).exe vimrun.exe install.exe uninstal.exe xxd/xxd.exe \
+ GvimExt/gvimext.dll
+
+***************
+*** 794,800 ****
+
+ # Create a default rule for transforming .c files to .obj files in $(OUTDIR)
+ # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
+! !IF "$(_NMAKE_VER)" == ""
+ .c{$(OUTDIR)/}.obj:
+ !ELSE
+ .c{$(OUTDIR)/}.obj::
+--- 851,857 ----
+
+ # Create a default rule for transforming .c files to .obj files in $(OUTDIR)
+ # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
+! !IF "$(MSVCVER)" == "4.0"
+ .c{$(OUTDIR)/}.obj:
+ !ELSE
+ .c{$(OUTDIR)/}.obj::
+***************
+*** 803,809 ****
+
+ # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
+ # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
+! !IF "$(_NMAKE_VER)" == ""
+ .cpp{$(OUTDIR)/}.obj:
+ !ELSE
+ .cpp{$(OUTDIR)/}.obj::
+--- 860,866 ----
+
+ # Create a default rule for transforming .cpp files to .obj files in $(OUTDIR)
+ # Batch compilation is supported by nmake 1.62 (part of VS 5.0) and later)
+! !IF "$(MSVCVER)" == "4.0"
+ .cpp{$(OUTDIR)/}.obj:
+ !ELSE
+ .cpp{$(OUTDIR)/}.obj::
+*** ../vim-7.1.133/src/version.c Wed Oct 3 12:49:24 2007
+--- src/version.c Wed Oct 3 13:23:51 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 134,
+ /**/
+
+--
+BLACK KNIGHT: The Black Knight always triumphs. Have at you!
+ ARTHUR takes his last leg off. The BLACK KNIGHT's body lands upright.
+BLACK KNIGHT: All right, we'll call it a draw.
+ "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.135
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.135?rev=1053&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.135 (added)
+++ trunk/packages/vim/upstream/patches/7.1.135 Wed Oct 3 14:10:07 2007
@@ -1,0 +1,106 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.135
+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.135
+Problem: Win32: When editing a file c:\tmp\foo and c:\tmp\\foo we have two
+ buffers for the same file. (Suresh Govindachar)
+Solution: Invoke FullName_save() when a path contains "//" or "\\".
+Files: src/buffer.c
+
+
+*** ../vim-7.1.134/src/buffer.c Sun Sep 30 14:00:41 2007
+--- src/buffer.c Wed Oct 3 14:24:52 2007
+***************
+*** 4175,4203 ****
+ * mess up the full path name, even though it starts with a '/'.
+ * Also expand when there is ".." in the file name, try to remove it,
+ * because "c:/src/../README" is equal to "c:/README".
+ * For MS-Windows also expand names like "longna~1" to "longname".
+ */
+ #ifdef UNIX
+ return FullName_save(fname, TRUE);
+ #else
+! if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL
+! #if defined(MSWIN) || defined(DJGPP)
+ || vim_strchr(fname, '~') != NULL
+! #endif
+ )
+ return FullName_save(fname, FALSE);
+
+ fname = vim_strsave(fname);
+
+! #ifdef USE_FNAME_CASE
+! # ifdef USE_LONG_FNAME
+ if (USE_LONG_FNAME)
+! # endif
+ {
+ if (fname != NULL)
+ fname_case(fname, 0); /* set correct case for file name */
+ }
+! #endif
+
+ return fname;
+ #endif
+--- 4175,4209 ----
+ * mess up the full path name, even though it starts with a '/'.
+ * Also expand when there is ".." in the file name, try to remove it,
+ * because "c:/src/../README" is equal to "c:/README".
++ * Similarly "c:/src//file" is equal to "c:/src/file".
+ * For MS-Windows also expand names like "longna~1" to "longname".
+ */
+ #ifdef UNIX
+ return FullName_save(fname, TRUE);
+ #else
+! if (!vim_isAbsName(fname)
+! || strstr((char *)fname, "..") != NULL
+! || strstr((char *)fname, "//") != NULL
+! # ifdef BACKSLASH_IN_FILENAME
+! || strstr((char *)fname, "\\\\") != NULL
+! # endif
+! # if defined(MSWIN) || defined(DJGPP)
+ || vim_strchr(fname, '~') != NULL
+! # endif
+ )
+ return FullName_save(fname, FALSE);
+
+ fname = vim_strsave(fname);
+
+! # ifdef USE_FNAME_CASE
+! # ifdef USE_LONG_FNAME
+ if (USE_LONG_FNAME)
+! # endif
+ {
+ if (fname != NULL)
+ fname_case(fname, 0); /* set correct case for file name */
+ }
+! # endif
+
+ return fname;
+ #endif
+*** ../vim-7.1.134/src/version.c Wed Oct 3 13:28:40 2007
+--- src/version.c Wed Oct 3 14:26:54 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 135,
+ /**/
+
+--
+ A village. Sound of chanting of Latin canon, punctuated by short, sharp
+ cracks. It comes nearer. We see it is a line of MONKS ala SEVENTH SEAL
+ flagellation scene, chanting and banging themselves on the foreheads with
+ wooden boards.
+ "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