SOURCES: 7.0.018 (NEW), 7.0.019 (NEW), 7.0.020 (NEW), 7.0.021 (NEW...

adamg adamg at pld-linux.org
Wed Jun 21 14:06:51 CEST 2006


Author: adamg                        Date: Wed Jun 21 12:06:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- new

---- Files affected:
SOURCES:
   7.0.018 (NONE -> 1.1)  (NEW), 7.0.019 (NONE -> 1.1)  (NEW), 7.0.020 (NONE -> 1.1)  (NEW), 7.0.021 (NONE -> 1.1)  (NEW), 7.0.022 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/7.0.018
diff -u /dev/null SOURCES/7.0.018:1.1
--- /dev/null	Wed Jun 21 14:06:51 2006
+++ SOURCES/7.0.018	Wed Jun 21 14:06:46 2006
@@ -0,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.018
+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.018
+Problem:    VMS: plugins are not loaded on startup.
+Solution:   Remove "**" from the path. (Zoltan Arpadffy)
+Files:	    src/main.c
+
+
+*** ../vim-7.0.017/src/main.c	Wed May  3 23:28:15 2006
+--- src/main.c	Mon Jun 19 10:54:40 2006
+***************
+*** 564,570 ****
+--- 564,574 ----
+       */
+      if (p_lpl)
+      {
++ # ifdef VMS	/* Somehow VMS doesn't handle the "**". */
++ 	source_runtime((char_u *)"plugin/*.vim", TRUE);
++ # else
+  	source_runtime((char_u *)"plugin/**/*.vim", TRUE);
++ # endif
+  	TIME_MSG("loading plugins");
+      }
+  #endif
+*** ../vim-7.0.017/src/version.c	Sat May 13 17:26:10 2006
+--- src/version.c	Mon Jun 19 10:55:29 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     18,
+  /**/
+
+-- 
+BLACK KNIGHT:  Come on you pansy!
+    [hah] [parry thrust]
+    [ARTHUR chops the BLACK KNIGHT's right arm off]
+ARTHUR:        Victory is mine!  [kneeling]
+               We thank thee Lord, that in thy merc-
+    [Black Knight kicks Arthur in the head while he is praying]
+                                  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.0.019
diff -u /dev/null SOURCES/7.0.019:1.1
--- /dev/null	Wed Jun 21 14:06:51 2006
+++ SOURCES/7.0.019	Wed Jun 21 14:06:46 2006
@@ -0,0 +1,46 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.019
+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.019
+Problem:    Repeating "VjA789" may cause a crash. (James Vega)
+Solution:   Check the cursor column after moving it to another line.
+Files:	    src/ops.c
+
+
+*** ../vim-7.0.018/src/ops.c	Sun Apr 30 20:45:12 2006
+--- src/ops.c	Tue Jun 20 12:49:46 2006
+***************
+*** 2413,2418 ****
+--- 2413,2419 ----
+  	else
+  	{
+  	    curwin->w_cursor = oap->end;
++ 	    check_cursor_col();
+  
+  	    /* Works just like an 'i'nsert on the next character. */
+  	    if (!lineempty(curwin->w_cursor.lnum)
+*** ../vim-7.0.018/src/version.c	Mon Jun 19 10:56:20 2006
+--- src/version.c	Tue Jun 20 12:55:10 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     19,
+  /**/
+
+-- 
+Two cows are standing together in a field.  One asks the other:
+"So what do you think about this Mad Cow Disease?"
+The other replies: "That doesn't concern me. I'm a helicopter."
+
+ /// 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.0.020
diff -u /dev/null SOURCES/7.0.020:1.1
--- /dev/null	Wed Jun 21 14:06:51 2006
+++ SOURCES/7.0.020	Wed Jun 21 14:06:46 2006
@@ -0,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.020
+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.020
+Problem:    Crash when using 'mousefocus'. (William Fulton)
+Solution:   Make buffer for mouse coordinates 2 bytes longer. (Juergen Weigert)
+Files:	    src/gui.c
+
+
+*** ../vim-7.0.019/src/gui.c	Sat May 13 12:15:09 2006
+--- src/gui.c	Tue Jun 20 16:27:02 2006
+***************
+*** 4515,4521 ****
+      int		y;
+  {
+      win_T	*wp;
+!     char_u	st[6];
+  
+      /* Ignore this while still starting up. */
+      if (!gui.in_use || gui.starting)
+--- 4515,4521 ----
+      int		y;
+  {
+      win_T	*wp;
+!     char_u	st[8];
+  
+      /* Ignore this while still starting up. */
+      if (!gui.in_use || gui.starting)
+*** ../vim-7.0.019/src/version.c	Tue Jun 20 12:56:11 2006
+--- src/version.c	Tue Jun 20 16:32:28 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     20,
+  /**/
+
+-- 
+Michael: There is no such thing as a dump question.
+Bernard: Sure there is.  For example "what is a core dump?"
+
+ /// 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.0.021
diff -u /dev/null SOURCES/7.0.021:1.1
--- /dev/null	Wed Jun 21 14:06:51 2006
+++ SOURCES/7.0.021	Wed Jun 21 14:06:46 2006
@@ -0,0 +1,139 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.021
+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.021
+Problem:    Crash when using "\\[" and "\\]" in 'errorformat'. (Marc Weber)
+Solution:   Check for valid submatches after matching the pattern.
+Files:      src/quickfix.c
+
+
+*** ../vim-7.0.020/src/quickfix.c	Wed May  3 23:23:30 2006
+--- src/quickfix.c	Tue Jun 20 17:04:20 2006
+***************
+*** 602,614 ****
+  		else
+  		    type = 0;
+  		/*
+! 		 * Extract error message data from matched line
+  		 */
+  		if ((i = (int)fmt_ptr->addr[0]) > 0)		/* %f */
+  		{
+! 		    int c = *regmatch.endp[i];
+  
+  		    /* Expand ~/file and $HOME/file to full path. */
+  		    *regmatch.endp[i] = NUL;
+  		    expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
+  		    *regmatch.endp[i] = c;
+--- 602,620 ----
+  		else
+  		    type = 0;
+  		/*
+! 		 * Extract error message data from matched line.
+! 		 * We check for an actual submatch, because "\[" and "\]" in
+! 		 * the 'errorformat' may cause the wrong submatch to be used.
+  		 */
+  		if ((i = (int)fmt_ptr->addr[0]) > 0)		/* %f */
+  		{
+! 		    int c;
+! 
+! 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+! 			continue;
+  
+  		    /* Expand ~/file and $HOME/file to full path. */
++ 		    c = *regmatch.endp[i];
+  		    *regmatch.endp[i] = NUL;
+  		    expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
+  		    *regmatch.endp[i] = c;
+***************
+*** 618,652 ****
+--- 624,686 ----
+  			continue;
+  		}
+  		if ((i = (int)fmt_ptr->addr[1]) > 0)		/* %n */
++ 		{
++ 		    if (regmatch.startp[i] == NULL)
++ 			continue;
+  		    enr = (int)atol((char *)regmatch.startp[i]);
++ 		}
+  		if ((i = (int)fmt_ptr->addr[2]) > 0)		/* %l */
++ 		{
++ 		    if (regmatch.startp[i] == NULL)
++ 			continue;
+  		    lnum = atol((char *)regmatch.startp[i]);
++ 		}
+  		if ((i = (int)fmt_ptr->addr[3]) > 0)		/* %c */
++ 		{
++ 		    if (regmatch.startp[i] == NULL)
++ 			continue;
+  		    col = (int)atol((char *)regmatch.startp[i]);
++ 		}
+  		if ((i = (int)fmt_ptr->addr[4]) > 0)		/* %t */
++ 		{
++ 		    if (regmatch.startp[i] == NULL)
++ 			continue;
+  		    type = *regmatch.startp[i];
++ 		}
+  		if (fmt_ptr->flags == '+' && !multiscan)	/* %+ */
+  		    STRCPY(errmsg, IObuff);
+  		else if ((i = (int)fmt_ptr->addr[5]) > 0)	/* %m */
+  		{
++ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
++ 			continue;
+  		    len = (int)(regmatch.endp[i] - regmatch.startp[i]);
+  		    vim_strncpy(errmsg, regmatch.startp[i], len);
+  		}
+  		if ((i = (int)fmt_ptr->addr[6]) > 0)		/* %r */
++ 		{
++ 		    if (regmatch.startp[i] == NULL)
++ 			continue;
+  		    tail = regmatch.startp[i];
++ 		}
+  		if ((i = (int)fmt_ptr->addr[7]) > 0)		/* %p */
+  		{
++ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
++ 			continue;
+  		    col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
+  		    if (*((char_u *)regmatch.startp[i]) != TAB)
+  			use_viscol = TRUE;
+  		}
+  		if ((i = (int)fmt_ptr->addr[8]) > 0)		/* %v */
+  		{
++ 		    if (regmatch.startp[i] == NULL)
++ 			continue;
+  		    col = (int)atol((char *)regmatch.startp[i]);
+  		    use_viscol = TRUE;
+  		}
+  		if ((i = (int)fmt_ptr->addr[9]) > 0)		/* %s */
+  		{
++ 		    if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
++ 			continue;
+  		    len = (int)(regmatch.endp[i] - regmatch.startp[i]);
+  		    if (len > CMDBUFFSIZE - 5)
+  			len = CMDBUFFSIZE - 5;
+*** ../vim-7.0.020/src/version.c	Tue Jun 20 16:33:21 2006
+--- src/version.c	Tue Jun 20 17:07:25 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     21,
+  /**/
+
+-- 
+TALL KNIGHT: We are now no longer the Knights Who Say Ni!
+ONE KNIGHT:  Ni!
+OTHERS:      Sh!
+ONE KNIGHT:  (whispers) Sorry.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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.0.022
diff -u /dev/null SOURCES/7.0.022:1.1
--- /dev/null	Wed Jun 21 14:06:51 2006
+++ SOURCES/7.0.022	Wed Jun 21 14:06:46 2006
@@ -0,0 +1,234 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.022
+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.022
+Problem:    Using buffer.append() in Ruby may append the line to the wrong
+	    buffer. (Alex Norman)
+Solution:   Properly switch to the buffer to do the appending.  Also for
+	    buffer.delete() and setting a buffer line.
+Files:	    src/if_ruby.c
+
+
+*** ../vim-7.0.021/src/if_ruby.c	Sun Apr 30 20:25:42 2006
+--- src/if_ruby.c	Tue Jun 20 21:01:23 2006
+***************
+*** 643,653 ****
+  
+  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
+  {
+!     buf_T *savebuf = curbuf;
+!     char *line = STR2CSTR(str);
+  
+!     if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
+  	curbuf = buf;
+  	if (u_savesub(n) == OK) {
+  	    ml_replace(n, (char_u *)line, TRUE);
+  	    changed();
+--- 643,665 ----
+  
+  static VALUE set_buffer_line(buf_T *buf, linenr_T n, VALUE str)
+  {
+!     char	*line = STR2CSTR(str);
+! #ifdef FEAT_AUTOCMD
+!     aco_save_T	aco;
+! #else
+!     buf_T	*save_curbuf = curbuf;
+! #endif
+  
+!     if (n > 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+!     {
+! #ifdef FEAT_AUTOCMD
+! 	/* set curwin/curbuf for "buf" and save some things */
+! 	aucmd_prepbuf(&aco, buf);
+! #else
+  	curbuf = buf;
++ 	curwin->w_buffer = buf;
++ #endif
++ 
+  	if (u_savesub(n) == OK) {
+  	    ml_replace(n, (char_u *)line, TRUE);
+  	    changed();
+***************
+*** 655,664 ****
+  	    syn_changed(n); /* recompute syntax hl. for this line */
+  #endif
+  	}
+! 	curbuf = savebuf;
+  	update_curbuf(NOT_VALID);
+      }
+!     else {
+  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
+  	return Qnil; /* For stop warning */
+      }
+--- 667,685 ----
+  	    syn_changed(n); /* recompute syntax hl. for this line */
+  #endif
+  	}
+! 
+! #ifdef FEAT_AUTOCMD
+! 	/* restore curwin/curbuf and a few other things */
+! 	aucmd_restbuf(&aco);
+! 	/* Careful: autocommands may have made "buf" invalid! */
+! #else
+! 	curwin->w_buffer = save_curbuf;
+! 	curbuf = save_curbuf;
+! #endif
+  	update_curbuf(NOT_VALID);
+      }
+!     else
+!     {
+  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
+  	return Qnil; /* For stop warning */
+      }
+***************
+*** 676,687 ****
+  
+  static VALUE buffer_delete(VALUE self, VALUE num)
+  {
+!     buf_T *buf = get_buf(self);
+!     buf_T *savebuf = curbuf;
+!     long n = NUM2LONG(num);
+  
+!     if (n > 0 && n <= buf->b_ml.ml_line_count) {
+  	curbuf = buf;
+  	if (u_savedel(n, 1) == OK) {
+  	    ml_delete(n, 0);
+  
+--- 697,720 ----
+  
+  static VALUE buffer_delete(VALUE self, VALUE num)
+  {
+!     buf_T	*buf = get_buf(self);
+!     long	n = NUM2LONG(num);
+! #ifdef FEAT_AUTOCMD
+!     aco_save_T	aco;
+! #else
+!     buf_T	*save_curbuf = curbuf;
+! #endif
+  
+!     if (n > 0 && n <= buf->b_ml.ml_line_count)
+!     {
+! #ifdef FEAT_AUTOCMD
+! 	/* set curwin/curbuf for "buf" and save some things */
+! 	aucmd_prepbuf(&aco, buf);
+! #else
+  	curbuf = buf;
++ 	curwin->w_buffer = buf;
++ #endif
++ 
+  	if (u_savedel(n, 1) == OK) {
+  	    ml_delete(n, 0);
+  
+***************
+*** 691,700 ****
+  
+  	    changed();
+  	}
+! 	curbuf = savebuf;
+  	update_curbuf(NOT_VALID);
+      }
+!     else {
+  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
+      }
+      return Qnil;
+--- 724,742 ----
+  
+  	    changed();
+  	}
+! 
+! #ifdef FEAT_AUTOCMD
+! 	/* restore curwin/curbuf and a few other things */
+! 	aucmd_restbuf(&aco);
+! 	/* Careful: autocommands may have made "buf" invalid! */
+! #else
+! 	curwin->w_buffer = save_curbuf;
+! 	curbuf = save_curbuf;
+! #endif
+  	update_curbuf(NOT_VALID);
+      }
+!     else
+!     {
+  	rb_raise(rb_eIndexError, "index %d out of buffer", n);
+      }
+      return Qnil;
+***************
+*** 702,714 ****
+  
+  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
+  {
+!     buf_T *buf = get_buf(self);
+!     buf_T *savebuf = curbuf;
+!     char *line = STR2CSTR(str);
+!     long n = NUM2LONG(num);
+  
+!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL) {
+  	curbuf = buf;
+  	if (u_inssub(n + 1) == OK) {
+  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
+  
+--- 744,768 ----
+  
+  static VALUE buffer_append(VALUE self, VALUE num, VALUE str)
+  {
+!     buf_T	*buf = get_buf(self);
+!     char	*line = STR2CSTR(str);
+!     long	n = NUM2LONG(num);
+! #ifdef FEAT_AUTOCMD
+!     aco_save_T	aco;
+! #else
+!     buf_T	*save_curbuf = curbuf;
+! #endif
+  
+!     if (n >= 0 && n <= buf->b_ml.ml_line_count && line != NULL)
+!     {
+! #ifdef FEAT_AUTOCMD
+! 	/* set curwin/curbuf for "buf" and save some things */
+! 	aucmd_prepbuf(&aco, buf);
+! #else
+  	curbuf = buf;
++ 	curwin->w_buffer = buf;
++ #endif
++ 
+  	if (u_inssub(n + 1) == OK) {
+  	    ml_append(n, (char_u *) line, (colnr_T) 0, FALSE);
+  
+***************
+*** 718,724 ****
+  
+  	    changed();
+  	}
+! 	curbuf = savebuf;
+  	update_curbuf(NOT_VALID);
+      }
+      else {
+--- 772,786 ----
+  
+  	    changed();
+  	}
+! 
+! #ifdef FEAT_AUTOCMD
+! 	/* restore curwin/curbuf and a few other things */
+! 	aucmd_restbuf(&aco);
+! 	/* Careful: autocommands may have made "buf" invalid! */
+! #else
+! 	curwin->w_buffer = save_curbuf;
+! 	curbuf = save_curbuf;
+! #endif
+  	update_curbuf(NOT_VALID);
+      }
+      else {
+*** ../vim-7.0.021/src/version.c	Tue Jun 20 20:49:42 2006
+--- src/version.c	Tue Jun 20 18:42:35 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     22,
+  /**/
================================================================


More information about the pld-cvs-commit mailing list