r915 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.196 upstream/patches/7.0.197 upstream/patches/7.0.198
upstream/patches/7.0.199 upstream/patches/7.0.200 upstream/patches/7.0.201
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Feb 20 04:19:57 UTC 2007
Author: jamessan
Date: Tue Feb 20 05:19:56 2007
New Revision: 915
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=915
Log:
Upstream patches 196 - 201
Added:
trunk/packages/vim/upstream/patches/7.0.196
trunk/packages/vim/upstream/patches/7.0.197
trunk/packages/vim/upstream/patches/7.0.198
trunk/packages/vim/upstream/patches/7.0.199
trunk/packages/vim/upstream/patches/7.0.200
trunk/packages/vim/upstream/patches/7.0.201
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=915&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Feb 20 05:19:56 2007
@@ -25,6 +25,7 @@
Collection of patches for Vim 7.0:
SIZE NAME INCLUDES
98331 7.0.001-100.gz patches 7.0.001 to 7.0.100, gzip'ed
+ 79463 7.0.101-200.gz patches 7.0.101 to 7.0.200, gzip'ed
Individual patches for Vim 7.0:
@@ -225,3 +226,9 @@
1599 7.0.193 crash when using --remote with arg matching 'wildignore'
2701 7.0.194 ml_get errors may be given in a recursive loop
2677 7.0.195 endless loop for conversion error when auto-writing
+ 2751 7.0.196 mouse pointer position wrong after ":vert ball"
+ 1717 7.0.197 (extra) Win32: can't compile with EXITFREE
+ 7454 7.0.198 (extra) Win32: compiler warnings, don't generate gvim.exe.mnf
+ 1969 7.0.199 cursor in wrong col when completing+formatting multi-byte
+ 2792 7.0.200 memory leaks when out of memory
+ 2511 7.0.201 error message from ":diffput" may be wrong
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=915&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Feb 20 05:19:56 2007
@@ -1,7 +1,7 @@
-vim (1:7.0-195+1) UNRELEASED; urgency=low
+vim (1:7.0-201+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (165 - 195), see README.gz for details.
+ * New upstream patches (165 - 201), see README.gz for details.
[ Stefano Zacchiroli ]
* vim-addons support:
@@ -17,7 +17,7 @@
* Fix the handling of alternatives which pointed at the stale alternative so
the alternative isn't changed from auto to manual.
- -- James Vega <jamessan at debian.org> Tue, 13 Feb 2007 10:33:48 -0500
+ -- James Vega <jamessan at debian.org> Mon, 19 Feb 2007 23:12:13 -0500
vim (1:7.0-164+3) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.0.196
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.196?rev=915&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.196 (added)
+++ trunk/packages/vim/upstream/patches/7.0.196 Tue Feb 20 05:19:56 2007
@@ -1,0 +1,89 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.196
+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.0.196
+Problem: When using ":vert ball" the computation of the mouse pointer
+ position may be off by one column. (Stefan Karlsson)
+Solution: Recompute the frame width when moving the vertical separator from
+ one window to another.
+Files: src/window.c
+
+
+*** ../vim-7.0.195/src/window.c Tue Nov 21 20:57:21 2006
+--- src/window.c Tue Feb 20 00:16:35 2007
+***************
+*** 1541,1548 ****
+ win1->w_prev->w_status_height = win1->w_status_height;
+ win1->w_status_height = height;
+ #ifdef FEAT_VERTSPLIT
+! win1->w_prev->w_vsep_width = 0;
+! win1->w_vsep_width = 1;
+ #endif
+ }
+ else if (win2 == lastwin)
+--- 1541,1555 ----
+ win1->w_prev->w_status_height = win1->w_status_height;
+ win1->w_status_height = height;
+ #ifdef FEAT_VERTSPLIT
+! if (win1->w_prev->w_vsep_width == 1)
+! {
+! /* Remove the vertical separator from the last-but-one window,
+! * add it to the last window. Adjust the frame widths. */
+! win1->w_prev->w_vsep_width = 0;
+! win1->w_prev->w_frame->fr_width -= 1;
+! win1->w_vsep_width = 1;
+! win1->w_frame->fr_width += 1;
+! }
+ #endif
+ }
+ else if (win2 == lastwin)
+***************
+*** 1551,1558 ****
+ win1->w_status_height = win2->w_status_height;
+ win2->w_status_height = height;
+ #ifdef FEAT_VERTSPLIT
+! win2->w_vsep_width = 1;
+! win1->w_vsep_width = 0;
+ #endif
+ }
+ win_remove(win1, NULL);
+--- 1558,1572 ----
+ win1->w_status_height = win2->w_status_height;
+ win2->w_status_height = height;
+ #ifdef FEAT_VERTSPLIT
+! if (win1->w_vsep_width == 1)
+! {
+! /* Remove the vertical separator from win1, add it to the last
+! * window, win2. Adjust the frame widths. */
+! win2->w_vsep_width = 1;
+! win2->w_frame->fr_width += 1;
+! win1->w_vsep_width = 0;
+! win1->w_frame->fr_width -= 1;
+! }
+ #endif
+ }
+ win_remove(win1, NULL);
+*** ../vim-7.0.195/src/version.c Tue Feb 13 06:21:24 2007
+--- src/version.c Tue Feb 20 00:14:00 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 196,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+150. You find yourself counting emoticons to get to sleep.
+
+ /// 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.0.197
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.197?rev=915&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.197 (added)
+++ trunk/packages/vim/upstream/patches/7.0.197 Tue Feb 20 05:19:56 2007
@@ -1,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.197 (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.0.197 (extra)
+Problem: Win32: Compiling with EXITFREE doesn't work.
+Solution: Adjust a few #ifdefs. (Alexei Alexandrof)
+Files: src/misc2.c, src/os_mswin.c
+
+
+*** ../vim-7.0.196/src/misc2.c Tue Oct 3 14:43:31 2006
+--- src/misc2.c Wed Feb 7 05:00:13 2007
+***************
+*** 1075,1081 ****
+ ResetRedobuff();
+ ResetRedobuff();
+
+! #ifdef FEAT_CLIENTSERVER
+ vim_free(serverDelayedStartName);
+ #endif
+
+--- 1075,1081 ----
+ ResetRedobuff();
+ ResetRedobuff();
+
+! #if defined(FEAT_CLIENTSERVER) && defined(FEAT_X11)
+ vim_free(serverDelayedStartName);
+ #endif
+
+*** ../vim-7.0.196/src/os_mswin.c Thu Apr 27 01:53:04 2006
+--- src/os_mswin.c Mon Feb 5 04:46:08 2007
+***************
+*** 239,244 ****
+--- 239,249 ----
+
+ if (gui.in_use)
+ gui_exit(r);
++
++ #ifdef EXITFREE
++ free_all_mem();
++ #endif
++
+ exit(r);
+ }
+
+*** ../vim-7.0.196/src/version.c Tue Feb 20 00:17:01 2007
+--- src/version.c Tue Feb 20 02:59:44 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 197,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+154. You fondle your mouse.
+
+ /// 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.0.198
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.198?rev=915&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.198 (added)
+++ trunk/packages/vim/upstream/patches/7.0.198 Tue Feb 20 05:19:56 2007
@@ -1,0 +1,232 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.198 (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.0.198 (extra)
+Problem: Win32: Compiler warnings. No need to generate gvim.exe.mnf.
+Solution: Add type casts. Use "*" for processorArchitecture. (George Reilly)
+Files: src/Make_mvc.mak, src/eval.c, src/gvim.exe.mnf, src/misc2.c
+
+
+*** ../vim-7.0.197/src/Make_mvc.mak Thu Apr 27 01:50:26 2006
+--- src/Make_mvc.mak Wed Feb 7 05:04:15 2007
+***************
+*** 683,689 ****
+ # on a crash (doesn't add overhead to the executable).
+ #
+ CFLAGS = $(CFLAGS) /Zi /Fd$(OUTDIR)/
+! LINK_PDB = /PDB:$(OUTDIR)/$(VIM).pdb -debug # -debug:full -debugtype:cv,fixup
+
+ #
+ # End extra feature include
+--- 683,689 ----
+ # 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
+***************
+*** 761,767 ****
+ - if exist $(VIM).pdb del $(VIM).pdb
+ - if exist $(VIM).map del $(VIM).map
+ - if exist $(VIM).ncb del $(VIM).ncb
+- - if exist gvim.exe.mnf del gvim.exe.mnf
+ - if exist vimrun.exe del vimrun.exe
+ - if exist install.exe del install.exe
+ - if exist uninstal.exe del uninstal.exe
+--- 761,766 ----
+***************
+*** 943,949 ****
+ $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
+ $(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
+
+! $(OUTDIR)/vim.res: $(OUTDIR) gvim.exe.mnf vim.rc version.h tools.bmp tearoff.bmp \
+ vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
+ $(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
+
+--- 942,948 ----
+ $(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
+ $(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
+
+! $(OUTDIR)/vim.res: $(OUTDIR) vim.rc version.h tools.bmp tearoff.bmp \
+ vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
+ $(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
+
+***************
+*** 961,966 ****
+--- 960,966 ----
+ # $CFLAGS may contain backslashes and double quotes, escape them both.
+ E0_CFLAGS = $(CFLAGS:\=\\)
+ E_CFLAGS = $(E0_CFLAGS:"=\")
++ # ") stop the string
+
+ $(PATHDEF_SRC): auto
+ @echo creating $(PATHDEF_SRC)
+***************
+*** 972,1001 ****
+ @echo char_u *all_lflags = (char_u *)"$(link:\=\\) $(LINKARGS1:\=\\) $(LINKARGS2:\=\\)"; >> $(PATHDEF_SRC)
+ @echo char_u *compiled_user = (char_u *)"$(USERNAME)"; >> $(PATHDEF_SRC)
+ @echo char_u *compiled_sys = (char_u *)"$(USERDOMAIN)"; >> $(PATHDEF_SRC)
+-
+- gvim.exe.mnf: auto
+- @echo ^<?xml version="1.0" encoding="UTF-8" standalone="yes"?^> >$@
+- @echo ^<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"^> >>$@
+- @echo ^<assemblyIdentity >>$@
+- @echo processorArchitecture="$(ASSEMBLY_ARCHITECTURE)" >>$@
+- @echo version="7.0.0.0" >>$@
+- @echo type="win32" >>$@
+- @echo name="Vim" >>$@
+- @echo /^> >>$@
+- @echo ^<description^>Vi Improved - A Text Editor^</description^> >>$@
+- @echo ^<dependency^> >>$@
+- @echo ^<dependentAssembly^> >>$@
+- @echo ^<assemblyIdentity >>$@
+- @echo type="win32" >>$@
+- @echo name="Microsoft.Windows.Common-Controls" >>$@
+- @echo version="6.0.0.0" >>$@
+- @echo publicKeyToken="6595b64144ccf1df" >>$@
+- @echo language="*" >>$@
+- @echo processorArchitecture="$(ASSEMBLY_ARCHITECTURE)" >>$@
+- @echo /^> >>$@
+- @echo ^</dependentAssembly^> >>$@
+- @echo ^</dependency^> >>$@
+- @echo ^</assembly^> >>$@
+
+ auto:
+ if not exist auto/nul mkdir auto
+--- 972,977 ----
+*** ../vim-7.0.197/src/eval.c Sun Jan 14 15:27:05 2007
+--- src/eval.c Wed Feb 7 05:01:29 2007
+***************
+*** 1004,1010 ****
+ if (ga_grow(&redir_ga, (int)len) == OK)
+ {
+ mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
+! redir_ga.ga_len += len;
+ }
+ else
+ var_redir_stop();
+--- 1004,1010 ----
+ if (ga_grow(&redir_ga, (int)len) == OK)
+ {
+ mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
+! redir_ga.ga_len += (int)len;
+ }
+ else
+ var_redir_stop();
+***************
+*** 10307,10313 ****
+ win_T *wp;
+ #endif
+
+! rettv->vval.v_number = FALSE;
+ #ifdef FEAT_QUICKFIX
+ if (rettv_list_alloc(rettv) == OK)
+ {
+--- 10307,10313 ----
+ win_T *wp;
+ #endif
+
+! rettv->vval.v_number = 0;
+ #ifdef FEAT_QUICKFIX
+ if (rettv_list_alloc(rettv) == OK)
+ {
+*** ../vim-7.0.197/src/gvim.exe.mnf Sun Jun 13 17:13:20 2004
+--- src/gvim.exe.mnf Wed Feb 7 05:06:52 2007
+***************
+*** 1,8 ****
+ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity
+! processorArchitecture="X86"
+! version="6.2.0.0"
+ type="win32"
+ name="Vim"
+ />
+--- 1,8 ----
+ <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+ <assemblyIdentity
+! processorArchitecture="*"
+! version="7.0.0.0"
+ type="win32"
+ name="Vim"
+ />
+***************
+*** 15,21 ****
+ version="6.0.0.0"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+! processorArchitecture="X86"
+ />
+ </dependentAssembly>
+ </dependency>
+--- 15,21 ----
+ version="6.0.0.0"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+! processorArchitecture="*"
+ />
+ </dependentAssembly>
+ </dependency>
+*** ../vim-7.0.197/src/misc2.c Tue Feb 20 03:01:33 2007
+--- src/misc2.c Wed Feb 7 05:00:13 2007
+***************
+*** 1246,1252 ****
+ char_u *escaped_string;
+
+ /* First count the number of extra bytes required. */
+! length = STRLEN(string) + 3; /* two quotes and the trailing NUL */
+ for (p = string; *p != NUL; mb_ptr_adv(p))
+ {
+ # if defined(WIN32) || defined(WIN16) || defined(DOS)
+--- 1246,1252 ----
+ char_u *escaped_string;
+
+ /* First count the number of extra bytes required. */
+! length = (unsigned)STRLEN(string) + 3; /* two quotes and a trailing NUL */
+ for (p = string; *p != NUL; mb_ptr_adv(p))
+ {
+ # if defined(WIN32) || defined(WIN16) || defined(DOS)
+***************
+*** 3718,3724 ****
+ *
+ * ATTENTION:
+ * ==========
+! * Also we use an allocated search context here, this functions ARE NOT
+ * thread-safe!!!!!
+ *
+ * To minimize parameter passing (or because I'm to lazy), only the
+--- 3718,3724 ----
+ *
+ * ATTENTION:
+ * ==========
+! * Also we use an allocated search context here, this functions are NOT
+ * thread-safe!!!!!
+ *
+ * To minimize parameter passing (or because I'm to lazy), only the
+*** ../vim-7.0.197/src/version.c Tue Feb 20 03:01:33 2007
+--- src/version.c Tue Feb 20 03:14:39 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 198,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+155. You forget to eat because you're too busy surfing the net.
+
+ /// 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.0.199
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.199?rev=915&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.199 (added)
+++ trunk/packages/vim/upstream/patches/7.0.199 Tue Feb 20 05:19:56 2007
@@ -1,0 +1,67 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.199
+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.0.199
+Problem: When using multi-byte characters the combination of completion and
+ formatting may result in a wrong cursor position.
+Solution: Don't decrement the cursor column, use dec_cursor(). (Yukihiro
+ Nakadaira) Also check for the column to be zero.
+Files: src/edit.c
+
+
+*** ../vim-7.0.198/src/edit.c Sun Feb 4 02:37:40 2007
+--- src/edit.c Fri Feb 16 01:15:49 2007
+***************
+*** 3448,3458 ****
+ }
+ else
+ {
+ /* put the cursor on the last char, for 'tw' formatting */
+! curwin->w_cursor.col--;
+ if (stop_arrow() == OK)
+ insertchar(NUL, 0, -1);
+! curwin->w_cursor.col++;
+ }
+
+ auto_format(FALSE, TRUE);
+--- 3449,3464 ----
+ }
+ else
+ {
++ int prev_col = curwin->w_cursor.col;
++
+ /* put the cursor on the last char, for 'tw' formatting */
+! if (prev_col > 0)
+! dec_cursor();
+ if (stop_arrow() == OK)
+ insertchar(NUL, 0, -1);
+! if (prev_col > 0
+! && ml_get_curline()[curwin->w_cursor.col] != NUL)
+! inc_cursor();
+ }
+
+ auto_format(FALSE, TRUE);
+*** ../vim-7.0.198/src/version.c Tue Feb 20 03:18:20 2007
+--- src/version.c Tue Feb 20 03:32:12 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 199,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+156. You forget your friend's name but not her e-mail address.
+
+ /// 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.0.200
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.200?rev=915&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.200 (added)
+++ trunk/packages/vim/upstream/patches/7.0.200 Tue Feb 20 05:19:56 2007
@@ -1,0 +1,100 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.200
+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.0.200
+Problem: Memory leaks when out of memory.
+Solution: Free the memory.
+Files: src/edit.c, src/diff.c
+
+
+*** ../vim-7.0.199/src/edit.c Tue Feb 20 03:33:51 2007
+--- src/edit.c Fri Feb 16 01:15:49 2007
+***************
+*** 2698,2703 ****
+--- 2698,2704 ----
+ buf = alloc(LSIZE);
+ if (buf == NULL)
+ return;
++ regmatch.regprog = NULL; /* so that we can goto theend */
+
+ /* If 'infercase' is set, don't use 'smartcase' here */
+ save_p_scs = p_scs;
+***************
+*** 2712,2724 ****
+ char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
+
+ if (pat_esc == NULL)
+! return ;
+ i = (int)STRLEN(pat_esc) + 10;
+ ptr = alloc(i);
+ if (ptr == NULL)
+ {
+ vim_free(pat_esc);
+! return;
+ }
+ vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
+ regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
+--- 2713,2725 ----
+ char_u *pat_esc = vim_strsave_escaped(pat, (char_u *)"\\");
+
+ if (pat_esc == NULL)
+! goto theend ;
+ i = (int)STRLEN(pat_esc) + 10;
+ ptr = alloc(i);
+ if (ptr == NULL)
+ {
+ vim_free(pat_esc);
+! goto theend;
+ }
+ vim_snprintf((char *)ptr, i, "^\\s*\\zs\\V%s", pat_esc);
+ regmatch.regprog = vim_regcomp(ptr, RE_MAGIC);
+*** ../vim-7.0.199/src/diff.c Sun Apr 23 00:23:34 2006
+--- src/diff.c Fri Feb 16 01:18:41 2007
+***************
+*** 1822,1835 ****
+--- 1822,1841 ----
+
+ idx = diff_buf_idx(wp->w_buffer);
+ if (idx == DB_COUNT) /* cannot happen */
++ {
++ vim_free(line_org);
+ return FALSE;
++ }
+
+ /* search for a change that includes "lnum" in the list of diffblocks. */
+ for (dp = curtab->tp_first_diff; dp != NULL; dp = dp->df_next)
+ if (lnum <= dp->df_lnum[idx] + dp->df_count[idx])
+ break;
+ if (dp == NULL || diff_check_sanity(curtab, dp) == FAIL)
++ {
++ vim_free(line_org);
+ return FALSE;
++ }
+
+ off = lnum - dp->df_lnum[idx];
+
+*** ../vim-7.0.199/src/version.c Tue Feb 20 03:33:51 2007
+--- src/version.c Tue Feb 20 03:48:16 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 200,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+157. You fum through a magazine, you first check to see if it has a web
+ address.
+
+ /// 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.0.201
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.201?rev=915&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.201 (added)
+++ trunk/packages/vim/upstream/patches/7.0.201 Tue Feb 20 05:19:56 2007
@@ -1,0 +1,81 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.201
+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.0.201
+Problem: Message for ":diffput" about buffer not being in diff mode may be
+ wrong.
+Solution: Check for buffer in diff mode but not modifiable.
+Files: src/diff.c
+
+
+*** ../vim-7.0.200/src/diff.c Tue Feb 20 03:52:04 2007
+--- src/diff.c Fri Feb 16 01:18:41 2007
+***************
+*** 2014,2019 ****
+--- 2014,2020 ----
+ int start_skip, end_skip;
+ int new_count;
+ int buf_empty;
++ int found_not_ma = FALSE;
+
+ /* Find the current buffer in the list of diff buffers. */
+ idx_cur = diff_buf_idx(curbuf);
+***************
+*** 2028,2040 ****
+ /* No argument: Find the other buffer in the list of diff buffers. */
+ for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
+ if (curtab->tp_diffbuf[idx_other] != curbuf
+! && curtab->tp_diffbuf[idx_other] != NULL
+! && (eap->cmdidx != CMD_diffput
+! || curtab->tp_diffbuf[idx_other]->b_p_ma))
+! break;
+ if (idx_other == DB_COUNT)
+ {
+! EMSG(_("E100: No other buffer in diff mode"));
+ return;
+ }
+
+--- 2029,2047 ----
+ /* No argument: Find the other buffer in the list of diff buffers. */
+ for (idx_other = 0; idx_other < DB_COUNT; ++idx_other)
+ if (curtab->tp_diffbuf[idx_other] != curbuf
+! && curtab->tp_diffbuf[idx_other] != NULL)
+! {
+! if (eap->cmdidx != CMD_diffput
+! || curtab->tp_diffbuf[idx_other]->b_p_ma)
+! break;
+! found_not_ma = TRUE;
+! }
+ if (idx_other == DB_COUNT)
+ {
+! if (found_not_ma)
+! EMSG(_("E793: No other buffer in diff mode is modifiable"));
+! else
+! EMSG(_("E100: No other buffer in diff mode"));
+ return;
+ }
+
+*** ../vim-7.0.200/src/version.c Tue Feb 20 03:52:04 2007
+--- src/version.c Tue Feb 20 04:46:00 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 201,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+159. You get excited whenever discussing your hard drive.
+
+ /// 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