SOURCES: 7.1.204 (NEW), 7.1.205 (NEW), 7.1.206 (NEW), 7.1.207 (NEW...

glen glen at pld-linux.org
Mon Jan 21 19:45:01 CET 2008


Author: glen                         Date: Mon Jan 21 18:45:01 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from upstream

---- Files affected:
SOURCES:
   7.1.204 (NONE -> 1.1)  (NEW), 7.1.205 (NONE -> 1.1)  (NEW), 7.1.206 (NONE -> 1.1)  (NEW), 7.1.207 (NONE -> 1.1)  (NEW), 7.1.208 (NONE -> 1.1)  (NEW), 7.1.209 (NONE -> 1.1)  (NEW), 7.1.210 (NONE -> 1.1)  (NEW), 7.1.211 (NONE -> 1.1)  (NEW), 7.1.212 (NONE -> 1.1)  (NEW), 7.1.213 (NONE -> 1.1)  (NEW), 7.1.214 (NONE -> 1.1)  (NEW), 7.1.215 (NONE -> 1.1)  (NEW), 7.1.216 (NONE -> 1.1)  (NEW), 7.1.217 (NONE -> 1.1)  (NEW), 7.1.218 (NONE -> 1.1)  (NEW), 7.1.219 (NONE -> 1.1)  (NEW), 7.1.220 (NONE -> 1.1)  (NEW), 7.1.221 (NONE -> 1.1)  (NEW), 7.1.222 (NONE -> 1.1)  (NEW), 7.1.223 (NONE -> 1.1)  (NEW), 7.1.224 (NONE -> 1.1)  (NEW), 7.1.225 (NONE -> 1.1)  (NEW), 7.1.226 (NONE -> 1.1)  (NEW), 7.1.227 (NONE -> 1.1)  (NEW), 7.1.228 (NONE -> 1.1)  (NEW), 7.1.229 (NONE -> 1.1)  (NEW), 7.1.230 (NONE -> 1.1)  (NEW), 7.1.231 (NONE -> 1.1)  (NEW), 7.1.232 (NONE -> 1.1)  (NEW), 7.1.233 (NONE -> 1.1)  (NEW), 7.1.234 (NONE -> 1.1)  (NEW), 7.1.235 (NONE -> 1.1)  (NEW), 7.1.236 (NONE -> 1.1)  (NEW
 )

---- Diffs:

================================================================
Index: SOURCES/7.1.204
diff -u /dev/null SOURCES/7.1.204:1.1
--- /dev/null	Mon Jan 21 19:45:01 2008
+++ SOURCES/7.1.204	Mon Jan 21 19:44:54 2008
@@ -0,0 +1,74 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.204 (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.204 (extra)
+Problem:    Win32: Using the example at 'balloonexpr' the balloon disappears
+	    after four seconds and then comes back again.  Also moves the
+	    mouse pointer a little bit.  (Yongwei Wu)
+Solution:   Set the autopop time to 30 seconds (the max value).  (Sergey
+	    Khorev)  Move the mouse two pixels forward and one back to end up
+	    in the same position (really!).
+Files:	    src/gui_w32.c
+
+
+
+*** ../vim-7.1.203/src/gui_w32.c	Thu Jan  3 20:44:35 2008
+--- src/gui_w32.c	Sat Jan  5 13:09:56 2008
+***************
+*** 4575,4585 ****
+      SendMessage(beval->balloon, TTM_ADDTOOL, 0, (LPARAM)pti);
+      /* Make tooltip appear sooner */
+      SendMessage(beval->balloon, TTM_SETDELAYTIME, TTDT_INITIAL, 10);
+      /*
+       * HACK: force tooltip to appear, because it'll not appear until
+       * first mouse move. D*mn M$
+       */
+!     mouse_event(MOUSEEVENTF_MOVE, 1, 1, 0, 0);
+      mouse_event(MOUSEEVENTF_MOVE, (DWORD)-1, (DWORD)-1, 0, 0);
+      vim_free(pti);
+  }
+--- 4575,4589 ----
+      SendMessage(beval->balloon, TTM_ADDTOOL, 0, (LPARAM)pti);
+      /* Make tooltip appear sooner */
+      SendMessage(beval->balloon, TTM_SETDELAYTIME, TTDT_INITIAL, 10);
++     /* I've performed some tests and it seems the longest possible life time
++      * of tooltip is 30 seconds */
++     SendMessage(beval->balloon, TTM_SETDELAYTIME, TTDT_AUTOPOP, 30000);
+      /*
+       * HACK: force tooltip to appear, because it'll not appear until
+       * first mouse move. D*mn M$
++      * Amazingly moving (2, 2) and then (-1, -1) the mouse doesn't move.
+       */
+!     mouse_event(MOUSEEVENTF_MOVE, 2, 2, 0, 0);
+      mouse_event(MOUSEEVENTF_MOVE, (DWORD)-1, (DWORD)-1, 0, 0);
+      vim_free(pti);
+  }
+*** ../vim-7.1.203/src/version.c	Fri Jan  4 21:25:01 2008
+--- src/version.c	Sat Jan  5 13:12:22 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     204,
+  /**/
+
+-- 
+WOMAN:   I didn't know we had a king. I thought we were an autonomous
+         collective.
+DENNIS:  You're fooling yourself.  We're living in a dictatorship.  A
+         self-perpetuating autocracy in which the working classes--
+WOMAN:   Oh there you go, bringing class into it again.
+DENNIS:  That's what it's all about if only people would--
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.205
diff -u /dev/null SOURCES/7.1.205:1.1
--- /dev/null	Mon Jan 21 19:45:01 2008
+++ SOURCES/7.1.205	Mon Jan 21 19:44:54 2008
@@ -0,0 +1,181 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.205
+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.205
+Problem:    Can't get the operator in an ":omap".
+Solution:   Add the "v:operator" variable. (Ben Schmidt)
+Files:	    runtime/doc/eval.txt, src/eval.c, src/normal.c, src/vim.h
+
+
+*** ../vim-7.1.204/runtime/doc/eval.txt	Tue Sep 25 17:54:41 2007
+--- runtime/doc/eval.txt	Fri Jan  4 20:38:55 2008
+***************
+*** 1,4 ****
+! *eval.txt*      For Vim version 7.1.  Last change: 2007 Sep 25
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt*      For Vim version 7.1.  Last change: 2008 Jan 04
+  
+  
+  		  VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 1401,1410 ****
+  		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
+! 		you want to cancel Visual mode and then use the count. >
+  			:vmap % <Esc>:call MyFilter(v:prevcount)<CR>
+  <		Read-only.
+  
+--- 1401,1424 ----
+  		This is the screen column number, like with |virtcol()|.  The
+  		value is zero when there was no mouse button click.
+  
++ 					*v:operator* *operator-variable*
++ v:operator	The last operator given in Normal mode.  This is a single
++ 		character except for commands starting with <g> or <z>,
++ 		in which case it is two characters.  Best used alongside
++ 		|v:prevcount| and |v:register|.  Useful if you want to cancel
++ 		Operator-pending mode and then use the operator, e.g.: >
++ 			:omap O <Esc>:call MyMotion(v:operator)<CR>
++ <		The value remains set until another operator is entered, thus
++ 		don't expect it to be empty.
++ 		v:operator is not set for |:delete|, |:yank| or other Ex
++ 		commands.
++ 		Read-only.
++ 
+  					*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
+! 		you want to cancel Visual or Operator-pending mode and then
+! 		use the count, e.g.: >
+  			:vmap % <Esc>:call MyFilter(v:prevcount)<CR>
+  <		Read-only.
+  
+*** ../vim-7.1.204/src/eval.c	Fri Dec  7 17:08:35 2007
+--- src/eval.c	Sat Jan  5 13:22:52 2008
+***************
+*** 345,350 ****
+--- 345,351 ----
+      {VV_NAME("mouse_win",	 VAR_NUMBER), 0},
+      {VV_NAME("mouse_lnum",	 VAR_NUMBER), 0},
+      {VV_NAME("mouse_col",	 VAR_NUMBER), 0},
++     {VV_NAME("operator",	 VAR_STRING), VV_RO},
+  };
+  
+  /* shorthand */
+*** ../vim-7.1.204/src/normal.c	Thu Jan  3 13:19:50 2008
+--- src/normal.c	Fri Jan  4 20:53:43 2008
+***************
+*** 141,146 ****
+--- 141,149 ----
+  static void	nv_Undo __ARGS((cmdarg_T *cap));
+  static void	nv_tilde __ARGS((cmdarg_T *cap));
+  static void	nv_operator __ARGS((cmdarg_T *cap));
++ #ifdef FEAT_EVAL
++ static void	set_op_var __ARGS((int optype));
++ #endif
+  static void	nv_lineop __ARGS((cmdarg_T *cap));
+  static void	nv_home __ARGS((cmdarg_T *cap));
+  static void	nv_pipe __ARGS((cmdarg_T *cap));
+***************
+*** 7180,7185 ****
+--- 7183,7191 ----
+  	{
+  	    cap->oap->start = curwin->w_cursor;
+  	    cap->oap->op_type = OP_DELETE;
++ #ifdef FEAT_EVAL
++ 	    set_op_var(OP_DELETE);
++ #endif
+  	    cap->count1 = 1;
+  	    nv_dollar(cap);
+  	    finish_op = TRUE;
+***************
+*** 8219,8226 ****
+--- 8225,8257 ----
+      {
+  	cap->oap->start = curwin->w_cursor;
+  	cap->oap->op_type = op_type;
++ #ifdef FEAT_EVAL
++ 	set_op_var(op_type);
++ #endif
++     }
++ }
++ 
++ #ifdef FEAT_EVAL
++ /*
++  * Set v:operator to the characters for "optype".
++  */
++     static void
++ set_op_var(optype)
++     int optype;
++ {
++     char_u	opchars[3];
++ 
++     if (optype == OP_NOP)
++ 	set_vim_var_string(VV_OP, NULL, 0);
++     else
++     {
++ 	opchars[0] = get_op_char(optype);
++ 	opchars[1] = get_extra_op_char(optype);
++ 	opchars[2] = NUL;
++ 	set_vim_var_string(VV_OP, opchars, -1);
+      }
+  }
++ #endif
+  
+  /*
+   * Handle linewise operator "dd", "yy", etc.
+*** ../vim-7.1.204/src/vim.h	Sat Aug 11 13:57:31 2007
+--- src/vim.h	Fri Jan  4 19:11:31 2008
+***************
+*** 1688,1694 ****
+  #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
+  
+--- 1688,1695 ----
+  #define VV_MOUSE_WIN	49
+  #define VV_MOUSE_LNUM   50
+  #define VV_MOUSE_COL	51
+! #define VV_OP		52
+! #define VV_LEN		53	/* number of v: vars */
+  
+  #ifdef FEAT_CLIPBOARD
+  
+*** ../vim-7.1.204/src/version.c	Sat Jan  5 13:15:08 2008
+--- src/version.c	Sat Jan  5 13:31:49 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     205,
+  /**/
+
+-- 
+ARTHUR:  Then who is your lord?
+WOMAN:   We don't have a lord.
+ARTHUR:  What?
+DENNIS:  I told you.  We're an anarcho-syndicalist commune.  We take it in
+         turns to act as a sort of executive officer for the week.
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.206
diff -u /dev/null SOURCES/7.1.206:1.1
--- /dev/null	Mon Jan 21 19:45:01 2008
+++ SOURCES/7.1.206	Mon Jan 21 19:44:54 2008
@@ -0,0 +1,59 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.206
+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.206
+Problem:    Compiler warnings when using MODIFIED_BY.
+Solution:   Add type casts. (Ben Schmidt)
+Files:	    src/version.c
+
+
+*** ../vim-7.1.205/src/version.c	Sat Jan  5 13:34:01 2008
+--- src/version.c	Sat Jan  5 13:56:55 2008
+***************
+*** 1587,1595 ****
+  
+      if (*mesg == ' ')
+      {
+! 	vim_strncpy(modby, _("Modified by "), MODBY_LEN - 1);
+  	l = STRLEN(modby);
+! 	vim_strncpy(modby + l, MODIFIED_BY, MODBY_LEN - l - 1);
+  	mesg = modby;
+      }
+  #endif
+--- 1589,1597 ----
+  
+      if (*mesg == ' ')
+      {
+! 	vim_strncpy(modby, (char_u *)_("Modified by "), MODBY_LEN - 1);
+  	l = STRLEN(modby);
+! 	vim_strncpy(modby + l, (char_u *)MODIFIED_BY, MODBY_LEN - l - 1);
+  	mesg = modby;
+      }
+  #endif
+*** ../vim-7.1.205/src/version.c	Sat Jan  5 13:34:01 2008
+--- src/version.c	Sat Jan  5 13:56:55 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     206,
+  /**/
+
+-- 
+ARTHUR:  I am your king!
+WOMAN:   Well, I didn't vote for you.
+ARTHUR:  You don't vote for kings.
+WOMAN:   Well, 'ow did you become king then?
+                                  The Quest for the Holy Grail (Monty Python)
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.207
diff -u /dev/null SOURCES/7.1.207:1.1
--- /dev/null	Mon Jan 21 19:45:01 2008
+++ SOURCES/7.1.207	Mon Jan 21 19:44:54 2008
@@ -0,0 +1,253 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.207
+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.207
+Problem:    Netbeans: "remove" cannot delete one line. 
+Solution:   Remove partial lines and whole lines properly.  Avoid a memory
+	    leak.  (Xavier de Gaye)
+Files:	    src/netbeans.c
+
+
+*** ../vim-7.1.206/src/netbeans.c	Thu May 10 18:40:48 2007
+--- src/netbeans.c	Sat Jan  5 18:03:24 2008
+***************
+*** 1204,1209 ****
+--- 1204,1257 ----
+      return result;
+  }
+  
++ /*
++  * Remove from "first" byte to "last" byte (inclusive), at line "lnum" of the
++  * current buffer.  Remove to end of line when "last" is MAXCOL.
++  */
++     static void
++ nb_partialremove(linenr_T lnum, colnr_T first, colnr_T last)
++ {
++     char_u *oldtext, *newtext;
++     int oldlen;
++     int lastbyte = last;
++ 
++     oldtext = ml_get(lnum);
++     oldlen = STRLEN(oldtext);
++     if (first >= oldlen || oldlen == 0)  /* just in case */
++ 	return;
++     if (lastbyte >= oldlen)
++ 	lastbyte = oldlen - 1;
++     newtext = alloc(oldlen - (int)(lastbyte - first));
++     if (newtext != NULL)
++     {
++ 	mch_memmove(newtext, oldtext, first);
++ 	mch_memmove(newtext + first, oldtext + lastbyte + 1, STRLEN(oldtext + lastbyte + 1) + 1);
++ 	nbdebug(("    NEW LINE %d: %s\n", lnum, newtext));
++ 	ml_replace(lnum, newtext, FALSE);
++     }
++ }
++ 
++ /*
++  * Replace the "first" line with the concatenation of the "first" and
++  * the "other" line. The "other" line is not removed.
++  */
++     static void
++ nb_joinlines(linenr_T first, linenr_T other)
++ {
++     int len_first, len_other;
++     char_u *p;
++ 
++     len_first = STRLEN(ml_get(first));
++     len_other = STRLEN(ml_get(other));
++     p = alloc((unsigned)(len_first + len_other + 1));
++     if (p != NULL)
++     {
++       mch_memmove(p, ml_get(first), len_first);
++       mch_memmove(p + len_first, ml_get(other), len_other + 1);
++       ml_replace(first, p, FALSE);
++     }
++ }
++ 
+  #define SKIP_STOP 2
+  #define streq(a,b) (strcmp(a,b) == 0)
+  static int needupdate = 0;
+***************
+*** 1371,1376 ****
+--- 1419,1426 ----
+  	    long count;
+  	    pos_T first, last;
+  	    pos_T *pos;
++ 	    pos_T *next;
++ 	    linenr_T del_from_lnum, del_to_lnum;  /* lines to be deleted as a whole */
+  	    int oldFire = netbeansFireChanges;
+  	    int oldSuppress = netbeansSuppressNoLines;
+  	    int wasChanged;
+***************
+*** 1420,1444 ****
+  		}
+  		last = *pos;
+  		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
+! 		curwin->w_cursor = first;
+  		doupdate = 1;
+  
+! 		/* keep part of first line */
+! 		if (first.lnum == last.lnum && first.col != last.col)
+  		{
+! 		    /* deletion is within one line */
+! 		    char_u *p = ml_get(first.lnum);
+! 		    mch_memmove(p + first.col, p + last.col + 1, STRLEN(p + last.col) + 1);
+! 		    nbdebug(("    NEW LINE %d: %s\n", first.lnum, p));
+! 		    ml_replace(first.lnum, p, TRUE);
+  		}
+  
+! 		if (first.lnum < last.lnum)
+  		{
+  		    int i;
+  
+  		    /* delete signs from the lines being deleted */
+! 		    for (i = first.lnum; i <= last.lnum; i++)
+  		    {
+  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
+  			if (id > 0)
+--- 1470,1544 ----
+  		}
+  		last = *pos;
+  		nbdebug(("    LAST POS: line %d, col %d\n", last.lnum, last.col));
+! 		del_from_lnum = first.lnum;
+! 		del_to_lnum = last.lnum;
+  		doupdate = 1;
+  
+! 		/* Get the position of the first byte after the deleted
+! 		 * section.  "next" is NULL when deleting to the end of the
+! 		 * file. */
+! 		next = off2pos(buf->bufp, off + count);
+! 
+! 		/* Remove part of the first line. */
+! 		if (first.col != 0 || (next != NULL && first.lnum == next->lnum))
+  		{
+! 		    if (first.lnum != last.lnum
+! 			    || (next != NULL && first.lnum != next->lnum))
+! 		    {
+! 			/* remove to the end of the first line */
+! 			nb_partialremove(first.lnum, first.col,
+! 							     (colnr_T)MAXCOL);
+! 			if (first.lnum == last.lnum)
+! 			{
+! 			    /* Partial line to remove includes the end of
+! 			     * line.  Join the line with the next one, have
+! 			     * the next line deleted below. */
+! 			    nb_joinlines(first.lnum, next->lnum);
+! 			    del_to_lnum = next->lnum;
+! 			}
+! 		    }
+! 		    else
+! 		    {
+! 			/* remove within one line */
+! 			nb_partialremove(first.lnum, first.col, last.col);
+! 		    }
+! 		    ++del_from_lnum;  /* don't delete the first line */
+! 		}
+! 
+! 		/* Remove part of the last line. */
+! 		if (first.lnum != last.lnum && next != NULL
+! 			&& next->col != 0 && last.lnum == next->lnum)
+! 		{
+! 		    nb_partialremove(last.lnum, 0, last.col);
+! 		    if (del_from_lnum > first.lnum)
+! 		    {
+! 			/* Join end of last line to start of first line; last
+! 			 * line is deleted below. */
+! 			nb_joinlines(first.lnum, last.lnum);
+! 		    }
+! 		    else
+! 			/* First line is deleted as a whole, keep the last
+! 			 * line. */
+! 			--del_to_lnum;
+  		}
+  
+! 		/* First is partial line; last line to remove includes
+! 		 * the end of line; join first line to line following last
+! 		 * line; line following last line is deleted below. */
+! 		if (first.lnum != last.lnum && del_from_lnum > first.lnum
+! 			&& next != NULL && last.lnum != next->lnum)
+! 		{
+! 		    nb_joinlines(first.lnum, next->lnum);
+! 		    del_to_lnum = next->lnum;
+! 		}
+! 
+! 		/* Delete whole lines if there are any. */
+! 		if (del_to_lnum >= del_from_lnum)
+  		{
+  		    int i;
+  
+  		    /* delete signs from the lines being deleted */
+! 		    for (i = del_from_lnum; i <= del_to_lnum; i++)
+  		    {
+  			int id = buf_findsign_id(buf->bufp, (linenr_T)i);
+  			if (id > 0)
+***************
+*** 1450,1459 ****
+  			    nbdebug(("    No sign on line %d\n", i));
+  		    }
+  
+! 		    /* delete whole lines */
+! 		    nbdebug(("    Deleting lines %d through %d\n", first.lnum, last.lnum));
+! 		    del_lines(last.lnum - first.lnum + 1, FALSE);
+  		}
+  		buf->bufp->b_changed = wasChanged; /* logically unchanged */
+  		netbeansFireChanges = oldFire;
+  		netbeansSuppressNoLines = oldSuppress;
+--- 1550,1564 ----
+  			    nbdebug(("    No sign on line %d\n", i));
+  		    }
+  
+! 		    nbdebug(("    Deleting lines %d through %d\n", del_from_lnum, del_to_lnum));
+! 		    curwin->w_cursor.lnum = del_from_lnum;
+! 		    curwin->w_cursor.col = 0;
+! 		    del_lines(del_to_lnum - del_from_lnum + 1, FALSE);
+  		}
++ 
++ 		/* Leave cursor at first deleted byte. */
++ 		curwin->w_cursor = first;
++ 		check_cursor_lnum();
+  		buf->bufp->b_changed = wasChanged; /* logically unchanged */
+  		netbeansFireChanges = oldFire;
+  		netbeansSuppressNoLines = oldSuppress;
+***************
+*** 2374,2381 ****
+   * the current buffer as "buf".
+   */
+      static void
+! nb_set_curbuf(buf)
+!     buf_T *buf;
+  {
+      if (curbuf != buf && buf_jump_open_win(buf) == NULL)
+  	set_curbuf(buf, DOBUF_GOTO);
+--- 2479,2485 ----
+   * the current buffer as "buf".
+   */
+      static void
+! nb_set_curbuf(buf_T *buf)
+  {
+      if (curbuf != buf && buf_jump_open_win(buf) == NULL)
+  	set_curbuf(buf, DOBUF_GOTO);
+*** ../vim-7.1.206/src/version.c	Sat Jan  5 13:58:48 2008
+--- src/version.c	Sat Jan  5 18:06:04 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     207,
+  /**/
+
+-- 
+Q:   How many hardware engineers does it take to change a lightbulb?
+A:   None.  We'll fix it in software.
+
+ /// 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    ///

================================================================
Index: SOURCES/7.1.208
diff -u /dev/null SOURCES/7.1.208:1.1
--- /dev/null	Mon Jan 21 19:45:01 2008
+++ SOURCES/7.1.208	Mon Jan 21 19:44:54 2008
@@ -0,0 +1,69 @@
<<Diff was trimmed, longer than 597 lines>>


More information about the pld-cvs-commit mailing list