r797 - in /trunk/packages/vim: debian/ patches/ upstream/patches/

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Oct 25 13:36:32 UTC 2006


Author: jamessan
Date: Wed Oct 25 13:36:31 2006
New Revision: 797

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=797
Log:
Add upstream patches 147 - 152.
Remove patches gui_xmebw.c-lesstif_crash.diff, gui_gtk.c-file_chooser_hig.diff since they're merged upstream.

Added:
    trunk/packages/vim/upstream/patches/7.0.147
    trunk/packages/vim/upstream/patches/7.0.148
    trunk/packages/vim/upstream/patches/7.0.149
    trunk/packages/vim/upstream/patches/7.0.150
    trunk/packages/vim/upstream/patches/7.0.151
    trunk/packages/vim/upstream/patches/7.0.152
Removed:
    trunk/packages/vim/patches/gui_gtk.c-file_chooser_hig.diff
    trunk/packages/vim/patches/gui_xmebw.c-lesstif_crash.diff
Modified:
    trunk/packages/vim/debian/README
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/series

Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=797&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Oct 25 13:36:31 2006
@@ -176,3 +176,9 @@
   5584  7.0.144  pattern matching may do wrong pointer computations
   1463  7.0.145  (after 7.0.142) compiler warning
   4308  7.0.146  opening file for quickfix may ignore windows already open
+  8181  7.0.147  session file can be wrong when there are multiple tab pages
+  1710  7.0.148  no error message for ":call d.foo()" when "foo" doesn't exist
+  5277  7.0.149  when resizing windows scrolling is not done in the best way
+  2416  7.0.150  when resizing the Vim window scrollbinding doesn't work
+  1932  7.0.151  button order in GTK file dialog is different from Gnome rules
+  2279  7.0.152  crash when using lesstif 2

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=797&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Oct 25 13:36:31 2006
@@ -1,11 +1,14 @@
-vim (1:7.0-146+1) UNRELEASED; urgency=low
+vim (1:7.0-152+1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (123 - 146), see README.gz for details.
+  * New upstream patches (123 - 152), see README.gz for details.
+    - Correct the button order in the GTK+ file chooser dialog so that it
+      matches the GNOME Human Interface Guidelines. (closes: #367639)
 
   [ James Vega ]
   * Bump vim-common's priority to important to match the override.
-  * Remove patch gui_gtk.c-abc_path.diff, merged upstream.
+  * Remove patch gui_gtk.c-abs_path.diff, merged upstream.
+  * Remove patch gui_xmebw.c-lesstif_crash.diff, merged upstream.
   * Add patch html.vim-syntax_spell.diff, which adds support for highlighting
     of spelling mistakes. (closes: #393347)
   * Add patch changelog.vim-ftplugin_split-buffer.diff, which corrects an
@@ -15,14 +18,11 @@
   [ Stefano Zacchiroli ]
   * Added patch dosini.vim-hash_comment.diff which adds support for # comments
     in dosini syntax highlighting, thanks to Adeodato Simó. (closes: #378952)
-  * Added patch gui_gtk.c-file_chooser_hig.diff which changes the button order
-    in the GTK+ file choose dialog so that it matches the GNOME Human
-    Interface Guidelines. (closes: #367639)
   * Added patch zh_TW.po-swap_recovery_typo.diff which fixes a typo in a
     traditional Chinese message when editing a file for which a swap file
     already exists. (closes: #347420)
 
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 24 Oct 2006 10:06:04 +0200
+ -- James Vega <jamessan at debian.org>  Wed, 25 Oct 2006 09:26:58 -0400
 
 vim (1:7.0-122+1) unstable; urgency=medium
 

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=797&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Wed Oct 25 13:36:31 2006
@@ -8,7 +8,6 @@
 php.vim.diff -p0
 de.po.diff -p0
 filetype.vim-better_tex_vs_plaintex.diff -p0
-gui_xmebw.c-lesstif_crash.diff -p0
 perl.vim-ftplugin_perldoc.diff -p0
 ruby.vim-ftplugin_ri.diff -p0
 python.vim-ftplugin_pydoc.diff -p0
@@ -17,5 +16,4 @@
 dosini.vim-hash_comment.diff -p0
 html.vim-syntax_spell.diff -p0
 changelog.vim-ftplugin_buffer-split.diff -p0
-gui_gtk.c-file_chooser_hig.diff -p0
 zh_TW.po-swap_recovery_typo.diff -p0

Added: trunk/packages/vim/upstream/patches/7.0.147
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.147?rev=797&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.147 (added)
+++ trunk/packages/vim/upstream/patches/7.0.147 Wed Oct 25 13:36:31 2006
@@ -1,0 +1,297 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.147
+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.147
+Problem:    When creating a session file and there are several tab pages and
+            some windows have a local directory a short file name may be used
+            when it's not valid. (Marius Roets)
+            A session with multiple tab pages may result in "No Name" buffers.
+            (Bill McCarthy)
+Solution:   Don't enter tab pages when going through the list, only use a
+            pointer to the first window in each tab page.
+            Use "tabedit" instead of "tabnew | edit" when possible.
+Files:      src/ex_docmd.c
+
+
+*** ../vim-7.0.146/src/ex_docmd.c	Sun Sep 10 21:05:39 2006
+--- src/ex_docmd.c	Tue Oct 24 12:55:11 2006
+***************
+*** 9643,9649 ****
+  #endif
+  
+  #ifdef FEAT_SESSION
+! static int ses_winsizes __ARGS((FILE *fd, int restore_size));
+  static int ses_win_rec __ARGS((FILE *fd, frame_T *fr));
+  static frame_T *ses_skipframe __ARGS((frame_T *fr));
+  static int ses_do_frame __ARGS((frame_T *fr));
+--- 9643,9650 ----
+  #endif
+  
+  #ifdef FEAT_SESSION
+! static int ses_winsizes __ARGS((FILE *fd, int restore_size,
+! 							win_T *tab_firstwin));
+  static int ses_win_rec __ARGS((FILE *fd, frame_T *fr));
+  static frame_T *ses_skipframe __ARGS((frame_T *fr));
+  static int ses_do_frame __ARGS((frame_T *fr));
+***************
+*** 9669,9676 ****
+      win_T	*wp;
+      char_u	*sname;
+      win_T	*edited_win = NULL;
+-     tabpage_T	*old_curtab = curtab;
+      int		tabnr;
+  
+      if (ssop_flags & SSOP_BUFFERS)
+  	only_save_windows = FALSE;		/* Save ALL buffers */
+--- 9670,9677 ----
+      win_T	*wp;
+      char_u	*sname;
+      win_T	*edited_win = NULL;
+      int		tabnr;
++     win_T	*tab_firstwin;
+  
+      if (ssop_flags & SSOP_BUFFERS)
+  	only_save_windows = FALSE;		/* Save ALL buffers */
+***************
+*** 9778,9791 ****
+      /*
+       * May repeat putting Windows for each tab, when "tabpages" is in
+       * 'sessionoptions'.
+       */
+      for (tabnr = 1; ; ++tabnr)
+      {
+  	if ((ssop_flags & SSOP_TABPAGES))
+  	{
+! 	    goto_tabpage(tabnr);
+! 	    if (tabnr > 1 && put_line(fd, "tabnew") == FAIL)
+! 		return FAIL;
+  	}
+  
+  	/*
+--- 9779,9804 ----
+      /*
+       * May repeat putting Windows for each tab, when "tabpages" is in
+       * 'sessionoptions'.
++      * Don't use goto_tabpage(), it may change directory and trigger
++      * autocommands.
+       */
++     tab_firstwin = firstwin;	/* first window in tab page "tabnr" */
+      for (tabnr = 1; ; ++tabnr)
+      {
++ 	int  need_tabnew = FALSE;
++ 
+  	if ((ssop_flags & SSOP_TABPAGES))
+  	{
+! 	    tabpage_T *tp = find_tabpage(tabnr);
+! 
+! 	    if (tp == NULL)
+! 		break;		/* done all tab pages */
+! 	    if (tp == curtab)
+! 		tab_firstwin = firstwin;
+! 	    else
+! 		tab_firstwin = tp->tp_firstwin;
+! 	    if (tabnr > 1)
+! 		need_tabnew = TRUE;
+  	}
+  
+  	/*
+***************
+*** 9793,9799 ****
+  	 * is aborted we don't end up with a number of useless windows.
+  	 * This may have side effects! (e.g., compressed or network file).
+  	 */
+! 	for (wp = firstwin; wp != NULL; wp = wp->w_next)
+  	{
+  	    if (ses_do_win(wp)
+  		    && wp->w_buffer->b_ffname != NULL
+--- 9806,9812 ----
+  	 * is aborted we don't end up with a number of useless windows.
+  	 * This may have side effects! (e.g., compressed or network file).
+  	 */
+! 	for (wp = tab_firstwin; wp != NULL; wp = wp->w_next)
+  	{
+  	    if (ses_do_win(wp)
+  		    && wp->w_buffer->b_ffname != NULL
+***************
+*** 9803,9817 ****
+  #endif
+  		    )
+  	    {
+! 		if (fputs("edit ", fd) < 0
+  			|| ses_fname(fd, wp->w_buffer, &ssop_flags) == FAIL)
+  		    return FAIL;
+  		if (!wp->w_arg_idx_invalid)
+  		    edited_win = wp;
+  		break;
+  	    }
+  	}
+  
+  	/*
+  	 * Save current window layout.
+  	 */
+--- 9816,9835 ----
+  #endif
+  		    )
+  	    {
+! 		if (fputs(need_tabnew ? "tabedit " : "edit ", fd) < 0
+  			|| ses_fname(fd, wp->w_buffer, &ssop_flags) == FAIL)
+  		    return FAIL;
++ 		need_tabnew = FALSE;
+  		if (!wp->w_arg_idx_invalid)
+  		    edited_win = wp;
+  		break;
+  	    }
+  	}
+  
++ 	/* If no file got edited create an empty tab page. */
++ 	if (need_tabnew && put_line(fd, "tabnew") == FAIL)
++ 	    return FAIL;
++ 
+  	/*
+  	 * Save current window layout.
+  	 */
+***************
+*** 9829,9835 ****
+  	 * Remember the window number of the current window after restoring.
+  	 */
+  	nr = 0;
+! 	for (wp = firstwin; wp != NULL; wp = W_NEXT(wp))
+  	{
+  	    if (ses_do_win(wp))
+  		++nr;
+--- 9847,9853 ----
+  	 * Remember the window number of the current window after restoring.
+  	 */
+  	nr = 0;
+! 	for (wp = tab_firstwin; wp != NULL; wp = W_NEXT(wp))
+  	{
+  	    if (ses_do_win(wp))
+  		++nr;
+***************
+*** 9852,9864 ****
+  	 */
+  	if (put_line(fd, "set winheight=1 winwidth=1") == FAIL)
+  	    return FAIL;
+! 	if (nr > 1 && ses_winsizes(fd, restore_size) == FAIL)
+  	    return FAIL;
+  
+  	/*
+  	 * Restore the view of the window (options, file, cursor, etc.).
+  	 */
+! 	for (wp = firstwin; wp != NULL; wp = wp->w_next)
+  	{
+  	    if (!ses_do_win(wp))
+  		continue;
+--- 9870,9882 ----
+  	 */
+  	if (put_line(fd, "set winheight=1 winwidth=1") == FAIL)
+  	    return FAIL;
+! 	if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
+  	    return FAIL;
+  
+  	/*
+  	 * Restore the view of the window (options, file, cursor, etc.).
+  	 */
+! 	for (wp = tab_firstwin; wp != NULL; wp = wp->w_next)
+  	{
+  	    if (!ses_do_win(wp))
+  		continue;
+***************
+*** 9879,9897 ****
+  	 * Restore window sizes again after jumping around in windows, because
+  	 * the current window has a minimum size while others may not.
+  	 */
+! 	if (nr > 1 && ses_winsizes(fd, restore_size) == FAIL)
+  	    return FAIL;
+  
+  	/* Don't continue in another tab page when doing only the current one
+  	 * or when at the last tab page. */
+! 	if (!(ssop_flags & SSOP_TABPAGES) || curtab->tp_next == NULL)
+  	    break;
+      }
+  
+      if (ssop_flags & SSOP_TABPAGES)
+      {
+- 	if (valid_tabpage(old_curtab))
+- 	    goto_tabpage_tp(old_curtab);
+  	if (fprintf(fd, "tabnext %d", tabpage_index(curtab)) < 0
+  		|| put_eol(fd) == FAIL)
+  	    return FAIL;
+--- 9897,9913 ----
+  	 * Restore window sizes again after jumping around in windows, because
+  	 * the current window has a minimum size while others may not.
+  	 */
+! 	if (nr > 1 && ses_winsizes(fd, restore_size, tab_firstwin) == FAIL)
+  	    return FAIL;
+  
+  	/* Don't continue in another tab page when doing only the current one
+  	 * or when at the last tab page. */
+! 	if (!(ssop_flags & SSOP_TABPAGES))
+  	    break;
+      }
+  
+      if (ssop_flags & SSOP_TABPAGES)
+      {
+  	if (fprintf(fd, "tabnext %d", tabpage_index(curtab)) < 0
+  		|| put_eol(fd) == FAIL)
+  	    return FAIL;
+***************
+*** 9927,9942 ****
+  }
+  
+      static int
+! ses_winsizes(fd, restore_size)
+      FILE	*fd;
+      int		restore_size;
+  {
+      int		n = 0;
+      win_T	*wp;
+  
+      if (restore_size && (ssop_flags & SSOP_WINSIZE))
+      {
+! 	for (wp = firstwin; wp != NULL; wp = wp->w_next)
+  	{
+  	    if (!ses_do_win(wp))
+  		continue;
+--- 9943,9959 ----
+  }
+  
+      static int
+! ses_winsizes(fd, restore_size, tab_firstwin)
+      FILE	*fd;
+      int		restore_size;
++     win_T	*tab_firstwin;
+  {
+      int		n = 0;
+      win_T	*wp;
+  
+      if (restore_size && (ssop_flags & SSOP_WINSIZE))
+      {
+! 	for (wp = tab_firstwin; wp != NULL; wp = wp->w_next)
+  	{
+  	    if (!ses_do_win(wp))
+  		continue;
+*** ../vim-7.0.146/src/version.c	Fri Oct 20 20:15:05 2006
+--- src/version.c	Tue Oct 24 12:57:04 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     147,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+95. Only communication in your household is through email.
+
+ /// 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.148
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.148?rev=797&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.148 (added)
+++ trunk/packages/vim/upstream/patches/7.0.148 Wed Oct 25 13:36:31 2006
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.148
+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.148
+Problem:    When doing "call a.xyz()" and "xyz" does not exist in dictionary
+	    "a" there is no error message. (Yegappan Lakshmanan)
+Solution:   Add the error message.
+Files:	    src/eval.c
+
+
+*** ../vim-7.0.147/src/eval.c	Tue Oct 17 15:17:41 2006
+--- src/eval.c	Tue Oct 24 11:01:25 2006
+***************
+*** 3125,3131 ****
+      funcdict_T	fudi;
+  
+      tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi);
+!     vim_free(fudi.fd_newkey);
+      if (tofree == NULL)
+  	return;
+  
+--- 3125,3136 ----
+      funcdict_T	fudi;
+  
+      tofree = trans_function_name(&arg, eap->skip, TFN_INT, &fudi);
+!     if (fudi.fd_newkey != NULL)
+!     {
+! 	/* Still need to give an error message for missing key. */
+! 	EMSG2(_(e_dictkey), fudi.fd_newkey);
+! 	vim_free(fudi.fd_newkey);
+!     }
+      if (tofree == NULL)
+  	return;
+  
+*** ../vim-7.0.147/src/version.c	Tue Oct 24 13:02:27 2006
+--- src/version.c	Tue Oct 24 13:50:39 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     148,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+99. The hum of a cooling fan and the click of keys is comforting to you.
+
+ /// 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.149
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.149?rev=797&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.149 (added)
+++ trunk/packages/vim/upstream/patches/7.0.149 Wed Oct 25 13:36:31 2006
@@ -1,0 +1,186 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.149
+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.149
+Problem:    When resizing a window that shows "~" lines the text sometimes
+	    jumps down.
+Solution:   Remove code that uses "~" lines in some situations.  Fix the
+            computation of the screen line of the cursor.  Also set w_skipcol
+	    to handle very long lines.
+Files:	    src/misc1.c, src/window.c
+
+
+*** ../vim-7.0.148/src/misc1.c	Tue Oct 17 11:12:28 2006
+--- src/misc1.c	Tue Oct 24 17:33:39 2006
+***************
+*** 1761,1775 ****
+       * Add column offset for 'number', 'foldcolumn', etc.
+       */
+      width = W_WIDTH(wp) - win_col_off(wp);
+!     if (width > 0)
+!     {
+! 	lines += 1;
+! 	if (col >= width)
+! 	    lines += (col - width) / (width + win_col_off2(wp));
+! 	if (lines <= wp->w_height)
+! 	    return lines;
+!     }
+!     return (int)(wp->w_height);	    /* maximum length */
+  }
+  
+      int
+--- 1761,1773 ----
+       * Add column offset for 'number', 'foldcolumn', etc.
+       */
+      width = W_WIDTH(wp) - win_col_off(wp);
+!     if (width <= 0)
+! 	return 9999;
+! 
+!     lines += 1;
+!     if (col > width)
+! 	lines += (col - width) / (width + win_col_off2(wp)) + 1;
+!     return lines;
+  }
+  
+      int
+*** ../vim-7.0.148/src/window.c	Tue Sep  5 16:29:38 2006
+--- src/window.c	Tue Oct 24 20:39:56 2006
+***************
+*** 5189,5199 ****
+      int		height;
+  {
+      linenr_T	lnum;
+-     linenr_T	bot;
+      int		sline, line_size;
+-     int		space;
+-     int		did_below = FALSE;
+-     int		old_height = wp->w_height;
+  #define FRACTION_MULT	16384L
+  
+      /* Don't want a negative height.  Happens when splitting a tiny window.
+--- 5189,5195 ----
+***************
+*** 5228,5281 ****
+  	wp->w_wrow = ((long)wp->w_fraction * (long)height - 1L) / FRACTION_MULT;
+  	line_size = plines_win_col(wp, lnum, (long)(wp->w_cursor.col)) - 1;
+  	sline = wp->w_wrow - line_size;
+  	if (sline < 0)
+  	{
+  	    /*
+  	     * Cursor line would go off top of screen if w_wrow was this high.
+  	     */
+  	    wp->w_wrow = line_size;
+  	}
+  	else
+  	{
+! 	    space = height - 1;
+! 
+! 	    while (lnum > 1)
+  	    {
+- 		/* When using "~" lines stop when at the old topline, don't
+- 		 * scroll down. */
+- 		if (did_below && height < old_height && lnum <= wp->w_topline)
+- 		    sline = 0;
+- 
+- 		space -= line_size;
+- 		if (space > 0 && sline <= 0 && !did_below)
+- 		{
+- 		    /* Try to use "~" lines below the text to avoid that text
+- 		     * is above the window while there are empty lines.
+- 		     * Subtract the rows below the cursor from "space" and
+- 		     * give the rest to "sline". */
+- 		    did_below = TRUE;
+- 		    bot = wp->w_cursor.lnum;
+- 		    while (space > 0)
+- 		    {
+- 			if (wp->w_buffer->b_ml.ml_line_count - bot >= space)
+- 			    space = 0;
+- 			else
+- 			{
+- #ifdef FEAT_FOLDING
+- 			    hasFoldingWin(wp, bot, NULL, &bot, TRUE, NULL);
+- #endif
+- 			    if (bot >= wp->w_buffer->b_ml.ml_line_count)
+- 				break;
+- 			    ++bot;
+- 			    space -= plines_win(wp, bot, TRUE);
+- 			}
+- 		    }
+- 		    if (bot == wp->w_buffer->b_ml.ml_line_count && space > 0)
+- 			sline += space;
+- 		}
+- 		if (sline <= 0)
+- 		    break;
+- 
+  #ifdef FEAT_FOLDING
+  		hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
+  		if (lnum == 1)
+--- 5224,5267 ----
+  	wp->w_wrow = ((long)wp->w_fraction * (long)height - 1L) / FRACTION_MULT;
+  	line_size = plines_win_col(wp, lnum, (long)(wp->w_cursor.col)) - 1;
+  	sline = wp->w_wrow - line_size;
++ 
++ 	if (sline >= 0)
++ 	{
++ 	    /* Make sure the whole cursor line is visible, if possible. */
++ 	    int rows = plines_win(wp, lnum, FALSE);
++ 
++ 	    if (sline > wp->w_height - rows)
++ 	    {
++ 		sline = wp->w_height - rows;
++ 		wp->w_wrow -= rows - line_size;
++ 	    }
++ 	}
++ 
+  	if (sline < 0)
+  	{
+  	    /*
+  	     * Cursor line would go off top of screen if w_wrow was this high.
++ 	     * Make cursor line the first line in the window.  If not enough
++ 	     * room use w_skipcol;
+  	     */
+  	    wp->w_wrow = line_size;
++ 	    if (wp->w_wrow >= wp->w_height
++ 				       && (W_WIDTH(wp) - win_col_off(wp)) > 0)
++ 	    {
++ 		wp->w_skipcol += W_WIDTH(wp) - win_col_off(wp);
++ 		--wp->w_wrow;
++ 		while (wp->w_wrow >= wp->w_height)
++ 		{
++ 		    wp->w_skipcol += W_WIDTH(wp) - win_col_off(wp)
++ 							   + win_col_off2(wp);
++ 		    --wp->w_wrow;
++ 		}
++ 	    }
+  	}
+  	else
+  	{
+! 	    while (sline > 0 && lnum > 1)
+  	    {
+  #ifdef FEAT_FOLDING
+  		hasFoldingWin(wp, lnum, &lnum, NULL, TRUE, NULL);
+  		if (lnum == 1)
+*** ../vim-7.0.148/src/version.c	Tue Oct 24 13:51:47 2006
+--- src/version.c	Tue Oct 24 21:13:31 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     149,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+104. When people ask about the Presidential Election you ask "Which country?"
+
+ /// 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.150
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.150?rev=797&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.150 (added)
+++ trunk/packages/vim/upstream/patches/7.0.150 Wed Oct 25 13:36:31 2006
@@ -1,0 +1,97 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.150
+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.150
+Problem:    When resizing the Vim window scrollbinding doesn't work. (Yakov
+            Lerner)
+Solution:   Do scrollbinding in set_shellsize().
+Files:      src/term.c
+    
+
+*** ../vim-7.0.149/src/term.c	Wed Aug 16 21:42:34 2006
+--- src/term.c	Tue Oct 24 11:26:33 2006
+***************
+*** 3137,3161 ****
+  	    screenalloc(FALSE);
+  	    repeat_message();
+  	}
+- 	else if (State & CMDLINE)
+- 	{
+- 	    update_screen(NOT_VALID);
+- 	    redrawcmdline();
+- 	}
+  	else
+  	{
+! 	    update_topline();
+! #if defined(FEAT_INS_EXPAND)
+! 	    if (pum_visible())
+  	    {
+! 		redraw_later(NOT_VALID);
+! 		ins_compl_show_pum(); /* This includes the redraw. */
+  	    }
+  	    else
+  #endif
+! 		update_screen(NOT_VALID);
+! 	    if (redrawing())
+! 		setcursor();
+  	}
+  	cursor_on();	    /* redrawing may have switched it off */
+      }
+--- 3138,3169 ----
+  	    screenalloc(FALSE);
+  	    repeat_message();
+  	}
+  	else
+  	{
+! #ifdef FEAT_SCROLLBIND
+! 	    if (curwin->w_p_scb)
+! 		do_check_scrollbind(TRUE);
+! #endif
+! 	    if (State & CMDLINE)
+  	    {
+! 		update_screen(NOT_VALID);
+! 		redrawcmdline();
+  	    }
+  	    else
++ 	    {
++ 		update_topline();
++ #if defined(FEAT_INS_EXPAND)
++ 		if (pum_visible())
++ 		{
++ 		    redraw_later(NOT_VALID);
++ 		    ins_compl_show_pum(); /* This includes the redraw. */
++ 		}
++ 		else
+  #endif
+! 		    update_screen(NOT_VALID);
+! 		if (redrawing())
+! 		    setcursor();
+! 	    }
+  	}
+  	cursor_on();	    /* redrawing may have switched it off */
+      }
+*** ../vim-7.0.149/src/version.c	Tue Oct 24 21:15:09 2006
+--- src/version.c	Tue Oct 24 21:33:39 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     150,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+106. When told to "go to your room" you inform your parents that you
+     can't...because you were kicked out and banned.
+
+ /// 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.151
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.151?rev=797&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.151 (added)
+++ trunk/packages/vim/upstream/patches/7.0.151 Wed Oct 25 13:36:31 2006
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.151
+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.151
+Problem:    Buttons in file dialog are not according to Gnome guidelines.
+Solution:   Swap Cancel and Open buttons. (Stefano Zacchiroli)
+Files:	    src/gui_gtk.c
+
+
+*** ../vim-7.0.150/src/gui_gtk.c	Tue Oct 10 18:29:21 2006
+--- src/gui_gtk.c	Sun Oct 22 15:33:40 2006
+***************
+*** 1293,1300 ****
+  	    GTK_WINDOW(gui.mainwin),
+  	    saving ? GTK_FILE_CHOOSER_ACTION_SAVE
+  					   : GTK_FILE_CHOOSER_ACTION_OPEN,
+- 	    saving ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+  	    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+  	    NULL);
+      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),
+  						       (const gchar *)dirbuf);
+--- 1293,1300 ----
+  	    GTK_WINDOW(gui.mainwin),
+  	    saving ? GTK_FILE_CHOOSER_ACTION_SAVE
+  					   : GTK_FILE_CHOOSER_ACTION_OPEN,
+  	    GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
++ 	    saving ? GTK_STOCK_SAVE : GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+  	    NULL);
+      gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(fc),
+  						       (const gchar *)dirbuf);
+*** ../vim-7.0.150/src/version.c	Tue Oct 24 21:38:16 2006
+--- src/version.c	Tue Oct 24 22:01:07 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     151,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+108. While reading a magazine, you look for the Zoom icon for a better
+     look at a photograph.
+
+ /// 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.152
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.152?rev=797&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.152 (added)
+++ trunk/packages/vim/upstream/patches/7.0.152 Wed Oct 25 13:36:31 2006
@@ -1,0 +1,74 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.152
+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.152
+Problem:    Crash when using lesstif 2.
+Solution:   Fill in the extension field. (Ben Hutchings)
+Files:	    src/gui_xmebw.c
+
+
+*** ../vim-7.0.151/src/gui_xmebw.c	Sat May 13 17:26:10 2006
+--- src/gui_xmebw.c	Tue Oct 24 22:27:53 2006
+***************
+*** 138,143 ****
+--- 138,156 ----
+      }
+  };
+  
++ /* This is needed to work around a bug in Lesstif 2, leaving the extension
++  * NULL somehow results in getting it set to an invalid pointer. */
++ XmPrimitiveClassExtRec xmEnhancedButtonPrimClassExtRec =
++ {
++     /* next_extension      */ NULL,
++     /* record_type         */ NULLQUARK,
++     /* version             */ XmPrimitiveClassExtVersion,
++     /* record_size         */ sizeof(XmPrimitiveClassExtRec),
++     /* widget_baseline     */ XmInheritBaselineProc,
++     /* widget_display_rect */ XmInheritDisplayRectProc,
++     /* widget_margins      */ NULL
++ };
++ 
+  XmEnhancedButtonClassRec xmEnhancedButtonClassRec =
+  {
+      {
+***************
+*** 184,190 ****
+  	/* arm and activate	 */ XmInheritArmAndActivate,
+  	/* synthetic resources	 */ NULL,
+  	/* number of syn res	 */ 0,
+! 	/* extension		 */ NULL,
+      },
+  
+      /* label_class fields */
+--- 197,203 ----
+  	/* arm and activate	 */ XmInheritArmAndActivate,
+  	/* synthetic resources	 */ NULL,
+  	/* number of syn res	 */ 0,
+! 	/* extension		 */ (XtPointer)&xmEnhancedButtonPrimClassExtRec,
+      },
+  
+      /* label_class fields */
+*** ../vim-7.0.151/src/version.c	Tue Oct 24 22:01:55 2006
+--- src/version.c	Tue Oct 24 22:30:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     152,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+110. You actually volunteer to become your employer's webmaster.
+
+ /// 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