r1218 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.1.258 upstream/patches/7.1.259 upstream/patches/7.1.260 upstream/patches/7.1.261 upstream/patches/7.1.262

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Sat Feb 23 18:13:55 UTC 2008


Author: jamessan
Date: Sat Feb 23 18:13:55 2008
New Revision: 1218

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1218
Log:
Upstream patches 258 - 262

Added:
    trunk/packages/vim/upstream/patches/7.1.258
    trunk/packages/vim/upstream/patches/7.1.259
    trunk/packages/vim/upstream/patches/7.1.260
    trunk/packages/vim/upstream/patches/7.1.261
    trunk/packages/vim/upstream/patches/7.1.262
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=1218&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Feb 23 18:13:55 2008
@@ -289,3 +289,7 @@
   1514  7.1.255  Vim doesn't support utf-32
  50921  7.1.256  findfile() also returns directories
   3326  7.1.257  configure can't always find the Tcl header files
+  3360  7.1.258  crash when doing "d/\n/e" and 'virtualedit' is "all"
+  1805  7.1.260  cursor position wrong after ^@ wrapping halfway if using utf-8
+  2255  7.1.261  for a 2 byte BOM UCS-2 is used, which doesn't work for UTF-16
+  3438  7.1.262  can't get the process ID of Vim

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1218&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Feb 23 18:13:55 2008
@@ -1,7 +1,7 @@
-vim (1:7.1-257+1) UNRELEASED; urgency=low
+vim (1:7.1-262+1) UNRELEASED; urgency=low
 
   [ James Vega ]
-  * New upstream patches (246 - 257), see README.gz for details.
+  * New upstream patches (246 - 262), see README.gz for details.
   * debian/control:
     - Build-Depend on tcl-dev instead of tcl8.4-dev per Tcl/Tk policy.
   * Added patches:

Added: trunk/packages/vim/upstream/patches/7.1.258
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.258?rev=1218&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.258 (added)
+++ trunk/packages/vim/upstream/patches/7.1.258 Sat Feb 23 18:13:55 2008
@@ -1,0 +1,116 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.258
+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.258
+Problem:    Crash when doing "d/\n/e" and 'virtualedit' is "all". (Andy Wokula)
+Solution:   Avoid that the column becomes negative.  Also fixes other problems
+	    with the end of a pattern match is in column zero. (A.Politz)
+Files:	    src/search.c
+
+
+*** ../vim-7.1.257/src/search.c	Sat Jan 26 21:15:00 2008
+--- src/search.c	Wed Feb 20 13:22:23 2008
+***************
+*** 624,630 ****
+  #ifdef FEAT_EVAL
+  		    submatch = first_submatch(&regmatch);
+  #endif
+! 		    /* Line me be past end of buffer for "\n\zs". */
+  		    if (lnum + matchpos.lnum > buf->b_ml.ml_line_count)
+  			ptr = (char_u *)"";
+  		    else
+--- 624,630 ----
+  #ifdef FEAT_EVAL
+  		    submatch = first_submatch(&regmatch);
+  #endif
+! 		    /* "lnum" may be past end of buffer for "\n\zs". */
+  		    if (lnum + matchpos.lnum > buf->b_ml.ml_line_count)
+  			ptr = (char_u *)"";
+  		    else
+***************
+*** 833,853 ****
+  			    continue;
+  		    }
+  
+! 		    if (options & SEARCH_END && !(options & SEARCH_NOOF))
+  		    {
+  			pos->lnum = lnum + endpos.lnum;
+! 			pos->col = endpos.col - 1;
+! #ifdef FEAT_MBYTE
+! 			if (has_mbyte)
+  			{
+! 			    /* 'e' offset may put us just below the last line */
+! 			    if (pos->lnum > buf->b_ml.ml_line_count)
+! 				ptr = (char_u *)"";
+! 			    else
+! 				ptr = ml_get_buf(buf, pos->lnum, FALSE);
+! 			    pos->col -= (*mb_head_off)(ptr, ptr + pos->col);
+  			}
+  #endif
+  		    }
+  		    else
+  		    {
+--- 833,870 ----
+  			    continue;
+  		    }
+  
+! 		    /* With the SEARCH_END option move to the last character
+! 		     * of the match.  Don't do it for an empty match, end
+! 		     * should be same as start then. */
+! 		    if (options & SEARCH_END && !(options & SEARCH_NOOF)
+! 			    && !(matchpos.lnum == endpos.lnum
+! 				&& matchpos.col == endpos.col))
+  		    {
++ 			/* For a match in the first column, set the position
++ 			 * on the NUL in the previous line. */
+  			pos->lnum = lnum + endpos.lnum;
+! 			pos->col = endpos.col;
+! 			if (endpos.col == 0)
+  			{
+! 			    if (pos->lnum > 1)  /* just in case */
+! 			    {
+! 				--pos->lnum;
+! 				pos->col = (colnr_T)STRLEN(ml_get_buf(buf,
+! 							   pos->lnum, FALSE));
+! 			    }
+  			}
++ 			else
++ 			{
++ 			    --pos->col;
++ #ifdef FEAT_MBYTE
++ 			    if (has_mbyte
++ 				    && pos->lnum <= buf->b_ml.ml_line_count)
++ 			    {
++ 				ptr = ml_get_buf(buf, pos->lnum, FALSE);
++ 				pos->col -= (*mb_head_off)(ptr, ptr + pos->col);
++ 			    }
+  #endif
++ 			}
+  		    }
+  		    else
+  		    {
+*** ../vim-7.1.257/src/version.c	Wed Feb 20 12:43:05 2008
+--- src/version.c	Wed Feb 20 13:37:32 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     258,
+  /**/
+
+-- 
+Micro$oft: where do you want to go today?
+    Linux: where do you want to go tomorrow?
+  FreeBSD: are you guys coming, or what?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.1.259
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.259?rev=1218&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.259 (added)
+++ trunk/packages/vim/upstream/patches/7.1.259 Sat Feb 23 18:13:55 2008
@@ -1,0 +1,61 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.259
+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.259
+Problem:    Cursor is in the wrong position when 'rightleft' is set,
+	    'encoding' is "utf-8" and on an illegal byte.  (Dominique Pelle)
+Solution:   Only put the cursor in the first column when actually on a
+	    double-wide character.  (Yukihiro Nakadaira)
+Files:	    src/screen.c
+
+
+*** ../vim-7.1.258/src/screen.c	Wed Feb 13 21:48:24 2008
+--- src/screen.c	Wed Feb 20 14:06:26 2008
+***************
+*** 8045,8053 ****
+  	windgoto(W_WINROW(curwin) + curwin->w_wrow,
+  		W_WINCOL(curwin) + (
+  #ifdef FEAT_RIGHTLEFT
+  		curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - (
+  # ifdef FEAT_MBYTE
+! 			has_mbyte ? (*mb_ptr2cells)(ml_get_cursor()) :
+  # endif
+  			1)) :
+  #endif
+--- 8045,8057 ----
+  	windgoto(W_WINROW(curwin) + curwin->w_wrow,
+  		W_WINCOL(curwin) + (
+  #ifdef FEAT_RIGHTLEFT
++ 		/* With 'rightleft' set and the cursor on a double-wide
++ 		 * character, position it on the leftmost column. */
+  		curwin->w_p_rl ? ((int)W_WIDTH(curwin) - curwin->w_wcol - (
+  # ifdef FEAT_MBYTE
+! 			(has_mbyte
+! 			   && (*mb_ptr2cells)(ml_get_cursor()) == 2
+! 			   && vim_isprintc(gchar_cursor())) ? 2 :
+  # endif
+  			1)) :
+  #endif
+*** ../vim-7.1.258/src/version.c	Wed Feb 20 13:41:14 2008
+--- src/version.c	Wed Feb 20 14:10:23 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     259,
+  /**/
+
+-- 
+A day without sunshine is like, well, night.
+
+ /// 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.260
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.260?rev=1218&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.260 (added)
+++ trunk/packages/vim/upstream/patches/7.1.260 Sat Feb 23 18:13:55 2008
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.260
+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.260
+Problem:    Cursor positioning problem after ^@ wrapping halfway when
+	    'encoding' is utf-8.
+Solution:   Only count a position for printable characters.  (partly by
+	    Yukihiro Nakadaira)
+Files:	    src/charset.c
+
+
+*** ../vim-7.1.259/src/charset.c	Sun Aug 19 22:42:27 2007
+--- src/charset.c	Wed Feb 20 14:39:04 2008
+***************
+*** 1290,1296 ****
+  		    /* If a double-cell char doesn't fit at the end of a line
+  		     * it wraps to the next line, it's like this char is three
+  		     * cells wide. */
+! 		    if (incr == 2 && wp->w_p_wrap && in_win_border(wp, vcol))
+  		    {
+  			++incr;
+  			head = 1;
+--- 1290,1297 ----
+  		    /* If a double-cell char doesn't fit at the end of a line
+  		     * it wraps to the next line, it's like this char is three
+  		     * cells wide. */
+! 		    if (incr == 2 && wp->w_p_wrap && MB_BYTE2LEN(*ptr) > 1
+! 			    && in_win_border(wp, vcol))
+  		    {
+  			++incr;
+  			head = 1;
+*** ../vim-7.1.259/src/version.c	Wed Feb 20 14:15:45 2008
+--- src/version.c	Wed Feb 20 14:57:45 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     260,
+  /**/
+
+-- 
+The users that I support would double-click on a landmine to find out
+what happens.				-- A system administrator
+
+ /// 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.261
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.261?rev=1218&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.261 (added)
+++ trunk/packages/vim/upstream/patches/7.1.261 Sat Feb 23 18:13:55 2008
@@ -1,0 +1,78 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.261
+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.261
+Problem:    When a 2 byte BOM is detected Vim uses UCS-2, which doesn't work
+	    for UTF-16 text. (Tony Mechelynck)
+Solution:   Default to UTF-16.
+Files:	    src/fileio.c, src/testdir/test42.ok
+
+
+*** ../vim-7.1.260/src/fileio.c	Fri Jan  4 16:30:40 2008
+--- src/fileio.c	Wed Feb 20 11:22:10 2008
+***************
+*** 5514,5523 ****
+      else if (p[0] == 0xfe && p[1] == 0xff
+  	    && (flags == FIO_ALL || flags == FIO_UCS2 || flags == FIO_UTF16))
+      {
+! 	if (flags == FIO_UTF16)
+! 	    name = "utf-16";	/* FE FF */
+! 	else
+  	    name = "ucs-2";	/* FE FF */
+      }
+      else if (size >= 4 && p[0] == 0 && p[1] == 0 && p[2] == 0xfe
+  	    && p[3] == 0xff && (flags == FIO_ALL || flags == FIO_UCS4))
+--- 5523,5533 ----
+      else if (p[0] == 0xfe && p[1] == 0xff
+  	    && (flags == FIO_ALL || flags == FIO_UCS2 || flags == FIO_UTF16))
+      {
+! 	/* Default to utf-16, it works also for ucs-2 text. */
+! 	if (flags == FIO_UCS2)
+  	    name = "ucs-2";	/* FE FF */
++ 	else
++ 	    name = "utf-16";	/* FE FF */
+      }
+      else if (size >= 4 && p[0] == 0 && p[1] == 0 && p[2] == 0xfe
+  	    && p[3] == 0xff && (flags == FIO_ALL || flags == FIO_UCS4))
+*** ../vim-7.1.260/src/testdir/test42.ok	Sun Jun 13 21:02:32 2004
+--- src/testdir/test42.ok	Wed Feb 20 13:27:37 2008
+***************
+*** 15,21 ****
+  utf-8€err
+  
+  
+!   fileencoding=ucs-2
+    bomb
+  ucs-2
+  
+--- 15,21 ----
+  utf-8€err
+  
+  
+!   fileencoding=utf-16
+    bomb
+  ucs-2
+  
+*** ../vim-7.1.260/src/version.c	Wed Feb 20 14:58:46 2008
+--- src/version.c	Wed Feb 20 18:13:00 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     261,
+  /**/
+
+-- 
+Seen it all, done it all, can't remember most of it.
+
+ /// 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.262
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.262?rev=1218&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.262 (added)
+++ trunk/packages/vim/upstream/patches/7.1.262 Sat Feb 23 18:13:55 2008
@@ -1,0 +1,111 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.262
+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.262
+Problem:    Can't get the process ID of Vim.
+Solution:   Implement getpid().
+Files:	    src/eval.c, runtime/doc/eval.txt
+
+
+*** ../vim-7.1.261/src/eval.c	Wed Feb 20 12:22:59 2008
+--- src/eval.c	Wed Feb 20 11:08:21 2008
+***************
+*** 532,537 ****
+--- 532,538 ----
+  static void f_getftype __ARGS((typval_T *argvars, typval_T *rettv));
+  static void f_getline __ARGS((typval_T *argvars, typval_T *rettv));
+  static void f_getmatches __ARGS((typval_T *argvars, typval_T *rettv));
++ static void f_getpid __ARGS((typval_T *argvars, typval_T *rettv));
+  static void f_getpos __ARGS((typval_T *argvars, typval_T *rettv));
+  static void f_getqflist __ARGS((typval_T *argvars, typval_T *rettv));
+  static void f_getreg __ARGS((typval_T *argvars, typval_T *rettv));
+***************
+*** 7132,7137 ****
+--- 7133,7139 ----
+      {"getline",		1, 2, f_getline},
+      {"getloclist",	1, 1, f_getqflist},
+      {"getmatches",	0, 0, f_getmatches},
++     {"getpid",		0, 0, f_getpid},
+      {"getpos",		1, 1, f_getpos},
+      {"getqflist",	0, 0, f_getqflist},
+      {"getreg",		0, 2, f_getreg},
+***************
+*** 10371,10376 ****
+--- 10373,10390 ----
+  	}
+      }
+  #endif
++ }
++ 
++ /*
++  * "getpid()" function
++  */
++ /*ARGSUSED*/
++     static void
++ f_getpid(argvars, rettv)
++     typval_T	*argvars;
++     typval_T	*rettv;
++ {
++     rettv->vval.v_number = mch_get_pid();
+  }
+  
+  /*
+*** ../vim-7.1.261/runtime/doc/eval.txt	Wed Feb 13 12:41:30 2008
+--- runtime/doc/eval.txt	Wed Feb 20 11:10:17 2008
+***************
+*** 1,4 ****
+! *eval.txt*      For Vim version 7.1.  Last change: 2008 Feb 13
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt*      For Vim version 7.1.  Last change: 2008 Feb 20
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 1638,1643 ****
+--- 1638,1644 ----
+  getline( {lnum}, {end})		List	lines {lnum} to {end} of current buffer
+  getloclist({nr})		List	list of location list items
+  getmatches()			List	list of current matches
++ getpid()			Number	process ID of Vim
+  getpos( {expr})			List	position of cursor, mark, etc.
+  getqflist()			List	list of quickfix items
+  getreg( [{regname} [, 1]])	String	contents of register
+***************
+*** 3833,3838 ****
+--- 3837,3846 ----
+  		characters.  nr2char(0) is a real NUL and terminates the
+  		string, thus results in an empty string.
+  
++ 							*getpid()*
++ getpid()	Return a Number which is the process ID of the Vim process.
++ 		On Unix this is a unique number.  On MS-DOS it's always zero.
++ 
+  							*getpos()*
+  getpos({expr})	Get the position for {expr}.  For possible values of {expr}
+  		see |line()|.
+*** ../vim-7.1.261/src/version.c	Wed Feb 20 18:14:25 2008
+--- src/version.c	Wed Feb 20 20:04:14 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     262,
+  /**/
+
+-- 
+Those who live by the sword get shot by those who don't.
+
+ /// 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