r801 - in /trunk/packages/vim: debian/README debian/changelog patches/option.c-foldnestmax_check.diff patches/series upstream/patches/7.0.153 upstream/patches/7.0.154 upstream/patches/7.0.155

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Nov 1 17:08:56 CET 2006


Author: jamessan
Date: Wed Nov  1 17:08:56 2006
New Revision: 801

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=801
Log:
Upstream patches 153 - 155.
Remove option.c-foldnestmax_check.diff since that's handled by patch 154.

Added:
    trunk/packages/vim/upstream/patches/7.0.153
    trunk/packages/vim/upstream/patches/7.0.154
    trunk/packages/vim/upstream/patches/7.0.155
Removed:
    trunk/packages/vim/patches/option.c-foldnestmax_check.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=801&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Nov  1 17:08:56 2006
@@ -182,3 +182,6 @@
   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
+  4356  7.0.153  crash with cscope when temp file can't be opened
+  1727  7.0.154  when 'foldnextmax' is negative Vim could hang
+  5872  7.0.155  when getchar() returns a mouse button the position is unknown

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=801&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Nov  1 17:08:56 2006
@@ -1,10 +1,10 @@
-vim (1:7.0-152+2) unstable; urgency=low
-
-  [ James Vega ]
-  * Add patch option.c-foldnestmax_check.diff, which ensures 'foldnestmax'
-    cannot be set to a negative number. (closes: #395413)
-
- -- James Vega <jamessan at debian.org>  Sun, 29 Oct 2006 10:08:41 -0500
+vim (1:7.0-155+2) unstable; urgency=low
+
+  [ Debian Vim Maintainers ]
+  * New upstream patches (153 - 155), see README.gz for details.
+    - Do not let the fold level become negative. (closes: #395413)
+
+ -- James Vega <jamessan at debian.org>  Wed,  1 Nov 2006 11:04:17 -0500
 
 vim (1:7.0-152+1) unstable; urgency=low
 

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=801&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Wed Nov  1 17:08:56 2006
@@ -17,4 +17,3 @@
 html.vim-syntax_spell.diff -p0
 changelog.vim-ftplugin_buffer-split.diff -p0
 zh_TW.po-swap_recovery_typo.diff -p0
-option.c-foldnestmax_check.diff -p0

Added: trunk/packages/vim/upstream/patches/7.0.153
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.153?rev=801&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.153 (added)
+++ trunk/packages/vim/upstream/patches/7.0.153 Wed Nov  1 17:08:56 2006
@@ -1,0 +1,154 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.153
+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.153
+Problem:    When using cscope and opening the temp file fails Vim crashes.
+	    (Kaya Bekiroglu)
+Solution:   Check for NULL pointer returned from mch_open().
+Files:	    src/if_cscope.c
+
+
+*** ../vim-7.0.152/src/if_cscope.c	Tue Aug 29 17:28:56 2006
+--- src/if_cscope.c	Mon Oct 30 22:26:01 2006
+***************
+*** 1100,1137 ****
+      if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
+      {
+  	/* fill error list */
+! 	FILE *f;
+! 	char_u *tmp = vim_tempname('c');
+  	qf_info_T   *qi = NULL;
+  	win_T	    *wp = NULL;
+  
+  	f = mch_fopen((char *)tmp, "w");
+! 	cs_file_results(f, nummatches);
+! 	fclose(f);
+! 	if (use_ll)	    /* Use location list */
+! 	    wp = curwin;
+! 	/* '-' starts a new error list */
+! 	if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m", *qfpos == '-') > 0)
+  	{
+! # ifdef FEAT_WINDOWS
+! 	    if (postponed_split != 0)
+  	    {
+! 		win_split(postponed_split > 0 ? postponed_split : 0,
+  						       postponed_split_flags);
+  #  ifdef FEAT_SCROLLBIND
+! 		curwin->w_p_scb = FALSE;
+  #  endif
+! 		postponed_split = 0;
+! 	    }
+  # endif
+! 	    if (use_ll)
+! 		/*
+! 		 * In the location list window, use the displayed location
+! 		 * list. Otherwise, use the location list for the window.
+! 		 */
+! 		qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL) ?
+! 				    wp->w_llist_ref : wp->w_llist;
+! 	    qf_jump(qi, 0, 0, forceit);
+  	}
+  	mch_remove(tmp);
+  	vim_free(tmp);
+--- 1100,1143 ----
+      if (qfpos != NULL && *qfpos != '0' && totmatches > 0)
+      {
+  	/* fill error list */
+! 	FILE	    *f;
+! 	char_u	    *tmp = vim_tempname('c');
+  	qf_info_T   *qi = NULL;
+  	win_T	    *wp = NULL;
+  
+  	f = mch_fopen((char *)tmp, "w");
+! 	if (f == NULL)
+! 	    EMSG2(_(e_notopen), tmp);
+! 	else
+  	{
+! 	    cs_file_results(f, nummatches);
+! 	    fclose(f);
+! 	    if (use_ll)	    /* Use location list */
+! 		wp = curwin;
+! 	    /* '-' starts a new error list */
+! 	    if (qf_init(wp, tmp, (char_u *)"%f%*\\t%l%*\\t%m",
+! 							   *qfpos == '-') > 0)
+  	    {
+! # ifdef FEAT_WINDOWS
+! 		if (postponed_split != 0)
+! 		{
+! 		    win_split(postponed_split > 0 ? postponed_split : 0,
+  						       postponed_split_flags);
+  #  ifdef FEAT_SCROLLBIND
+! 		    curwin->w_p_scb = FALSE;
+  #  endif
+! 		    postponed_split = 0;
+! 		}
+  # endif
+! 		if (use_ll)
+! 		    /*
+! 		     * In the location list window, use the displayed location
+! 		     * list. Otherwise, use the location list for the window.
+! 		     */
+! 		    qi = (bt_quickfix(wp->w_buffer) && wp->w_llist_ref != NULL)
+! 			?  wp->w_llist_ref : wp->w_llist;
+! 		qf_jump(qi, 0, 0, forceit);
+! 	    }
+  	}
+  	mch_remove(tmp);
+  	vim_free(tmp);
+***************
+*** 1723,1729 ****
+  	       continue;
+  
+  	   context = (char *)alloc((unsigned)strlen(cntx)+5);
+! 	   if (context==NULL)
+  	       continue;
+  
+  	   if (strcmp(cntx, "<global>")==0)
+--- 1729,1735 ----
+  	       continue;
+  
+  	   context = (char *)alloc((unsigned)strlen(cntx)+5);
+! 	   if (context == NULL)
+  	       continue;
+  
+  	   if (strcmp(cntx, "<global>")==0)
+***************
+*** 1731,1737 ****
+  	   else
+  	       sprintf(context, "<<%s>>", cntx);
+  
+! 	   if (search==NULL)
+  	       fprintf(f, "%s\t%s\t%s\n", fullname, slno, context);
+  	   else
+  	       fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search);
+--- 1737,1743 ----
+  	   else
+  	       sprintf(context, "<<%s>>", cntx);
+  
+! 	   if (search == NULL)
+  	       fprintf(f, "%s\t%s\t%s\n", fullname, slno, context);
+  	   else
+  	       fprintf(f, "%s\t%s\t%s %s\n", fullname, slno, context, search);
+*** ../vim-7.0.152/src/version.c	Tue Oct 24 22:31:51 2006
+--- src/version.c	Mon Oct 30 22:29:45 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     153,
+  /**/
+
+-- 
+You cannot have a baby in one month by getting nine women pregnant.
+
+ /// 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.154
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.154?rev=801&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.154 (added)
+++ trunk/packages/vim/upstream/patches/7.0.154 Wed Nov  1 17:08:56 2006
@@ -1,0 +1,65 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.154
+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.154
+Problem:    When 'foldnextmax' is negative Vim can hang. (James Vega)
+Solution:   Avoid the fold level becoming negative.
+Files:	    src/fold.c, src/syntax.c
+
+
+*** ../vim-7.0.153/src/fold.c	Sun Apr 23 00:31:04 2006
+--- src/fold.c	Sun Oct 29 20:23:21 2006
+***************
+*** 2971,2977 ****
+--- 2971,2981 ----
+      else
+  	flp->lvl = get_indent_buf(buf, lnum) / buf->b_p_sw;
+      if (flp->lvl > flp->wp->w_p_fdn)
++     {
+  	flp->lvl = flp->wp->w_p_fdn;
++ 	if (flp->lvl < 0)
++ 	    flp->lvl = 0;
++     }
+  }
+  
+  /* foldlevelDiff() {{{2 */
+*** ../vim-7.0.153/src/syntax.c	Tue Oct  3 17:04:21 2006
+--- src/syntax.c	Sun Oct 29 20:21:27 2006
+***************
+*** 6072,6078 ****
+--- 6072,6082 ----
+  		++level;
+      }
+      if (level > wp->w_p_fdn)
++     {
+  	level = wp->w_p_fdn;
++ 	if (level < 0)
++ 	    level = 0;
++     }
+      return level;
+  }
+  #endif
+*** ../vim-7.0.153/src/version.c	Mon Oct 30 22:31:30 2006
+--- src/version.c	Wed Nov  1 12:41:14 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     154,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+134. You consider bandwidth to be more important than carats.
+
+ /// 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.155
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.155?rev=801&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.155 (added)
+++ trunk/packages/vim/upstream/patches/7.0.155 Wed Nov  1 17:08:56 2006
@@ -1,0 +1,196 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.155
+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.155
+Problem:    When getchar() returns a mouse button click there is no way to get
+            the mouse coordinates.
+Solution:   Add v:mouse_win, v:mouse_lnum and v:mouse_col.
+Files:      runtime/doc/eval.txt, src/eval.c, src/vim.h
+
+
+*** ../vim-7.0.154/runtime/doc/eval.txt	Tue Oct  3 14:43:31 2006
+--- runtime/doc/eval.txt	Wed Nov  1 15:20:42 2006
+***************
+*** 1,4 ****
+! *eval.txt*      For Vim version 7.0.  Last change: 2006 Sep 22
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt*      For Vim version 7.0.  Last change: 2006 Nov 01
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 1374,1379 ****
+--- 1380,1400 ----
+  		'guitabtooltip'.  Only valid while one of these expressions is
+  		being evaluated.  Read-only when in the |sandbox|.
+  
++ 					*v:mouse_win* *mouse_win-variable*
++ v:mouse_win	Window number for a mouse click obtained with |getchar()|.
++ 		First window has number 1, like with |winnr()|.  The value is
++ 		zero when there was no mouse button click.
++ 
++ 					*v:mouse_lnum* *mouse_lnum-variable*
++ v:mouse_lnum	Line number for a mouse click obtained with |getchar()|.
++ 		This is the text line number, not the screen line number.  The
++ 		value is zero when there was no mouse button click.
++ 
++ 					*v:mouse_col* *mouse_col-variable*
++ v:mouse_col	Column number for a mouse click obtained with |getchar()|.
++ 		This is the screen column number, like with |virtcol()|.  The
++ 		value is zero when there was no mouse button click.
++ 
+  					*v:prevcount* *prevcount-variable*
+  v:prevcount	The count given for the last but one Normal mode command.
+  		This is the v:count value of the previous command.  Useful if
+***************
+*** 2702,2707 ****
+--- 2728,2744 ----
+  		one-byte character it is the character itself as a number.
+  		Use nr2char() to convert it to a String.
+  
++ 		When the user clicks a mouse button, the mouse event will be
++ 		returned.  The position can then be found in |v:mouse_col|,
++ 		|v:mouse_lnum| and |v:mouse_win|.  This example positions the
++ 		mouse as it would normally happen: >
++ 			let c = getchar()
++ 		  	if c == "\<LeftMouse>" && v:mouse_win > 0
++ 			  exe v:mouse_win . "wincmd w"
++ 			  exe v:mouse_lnum
++ 			  exe "normal " . v:mouse_col . "|"
++ 			endif
++ <
+  		There is no prompt, you will somehow have to make clear to the
+  		user that a character has to be typed.
+  		There is no mapping for the character.
+*** ../vim-7.0.154/src/eval.c	Tue Oct 24 13:51:47 2006
+--- src/eval.c	Wed Nov  1 13:39:52 2006
+***************
+*** 343,348 ****
+--- 342,350 ----
+      {VV_NAME("swapchoice",	 VAR_STRING), 0},
+      {VV_NAME("swapcommand",	 VAR_STRING), VV_RO},
+      {VV_NAME("char",		 VAR_STRING), VV_RO},
++     {VV_NAME("mouse_win",	 VAR_NUMBER), 0},
++     {VV_NAME("mouse_lnum",	 VAR_NUMBER), 0},
++     {VV_NAME("mouse_col",	 VAR_NUMBER), 0},
+  };
+  
+  /* shorthand */
+***************
+*** 9855,9860 ****
+--- 9857,9866 ----
+      --no_mapping;
+      --allow_keys;
+  
++     vimvars[VV_MOUSE_WIN].vv_nr = 0;
++     vimvars[VV_MOUSE_LNUM].vv_nr = 0;
++     vimvars[VV_MOUSE_COL].vv_nr = 0;
++ 
+      rettv->vval.v_number = n;
+      if (IS_SPECIAL(n) || mod_mask != 0)
+      {
+***************
+*** 9883,9888 ****
+--- 9889,9941 ----
+  	temp[i++] = NUL;
+  	rettv->v_type = VAR_STRING;
+  	rettv->vval.v_string = vim_strsave(temp);
++ 
++ #ifdef FEAT_MOUSE
++ 	if (n == K_LEFTMOUSE
++ 		|| n == K_LEFTMOUSE_NM
++ 		|| n == K_LEFTDRAG
++ 		|| n == K_LEFTRELEASE
++ 		|| n == K_LEFTRELEASE_NM
++ 		|| n == K_MIDDLEMOUSE
++ 		|| n == K_MIDDLEDRAG
++ 		|| n == K_MIDDLERELEASE
++ 		|| n == K_RIGHTMOUSE
++ 		|| n == K_RIGHTDRAG
++ 		|| n == K_RIGHTRELEASE
++ 		|| n == K_X1MOUSE
++ 		|| n == K_X1DRAG
++ 		|| n == K_X1RELEASE
++ 		|| n == K_X2MOUSE
++ 		|| n == K_X2DRAG
++ 		|| n == K_X2RELEASE
++ 		|| n == K_MOUSEDOWN
++ 		|| n == K_MOUSEUP)
++ 	{
++ 	    int		row = mouse_row;
++ 	    int		col = mouse_col;
++ 	    win_T	*win;
++ 	    linenr_T	lnum;
++ # ifdef FEAT_WINDOWS
++ 	    win_T	*wp;
++ # endif
++ 	    int		n = 1;
++ 
++ 	    if (row >= 0 && col >= 0)
++ 	    {
++ 		/* Find the window at the mouse coordinates and compute the
++ 		 * text position. */
++ 		win = mouse_find_win(&row, &col);
++ 		(void)mouse_comp_pos(win, &row, &col, &lnum);
++ # ifdef FEAT_WINDOWS
++ 		for (wp = firstwin; wp != win; wp = wp->w_next)
++ 		    ++n;
++ # endif
++ 		vimvars[VV_MOUSE_WIN].vv_nr = n;
++ 		vimvars[VV_MOUSE_LNUM].vv_nr = lnum;
++ 		vimvars[VV_MOUSE_COL].vv_nr = col + 1;
++ 	    }
++ 	}
++ #endif
+      }
+  }
+  
+*** ../vim-7.0.154/src/vim.h	Tue Aug 29 18:16:37 2006
+--- src/vim.h	Wed Nov  1 13:11:16 2006
+***************
+*** 1669,1675 ****
+  #define VV_SWAPCHOICE	46
+  #define VV_SWAPCOMMAND	47
+  #define VV_CHAR		48
+! #define VV_LEN		49	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+--- 1669,1678 ----
+  #define VV_SWAPCHOICE	46
+  #define VV_SWAPCOMMAND	47
+  #define VV_CHAR		48
+! #define VV_MOUSE_WIN	49
+! #define VV_MOUSE_LNUM   50
+! #define VV_MOUSE_COL	51
+! #define VV_LEN		52	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+*** ../vim-7.0.154/src/version.c	Wed Nov  1 12:43:07 2006
+--- src/version.c	Wed Nov  1 15:22:33 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     155,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+138. You develop a liking for cold coffee.
+
+ /// 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