packages: vim/vim.spec, vim/7.3.126 (NEW), vim/7.3.127 (NEW), vim/7.3.128 (...

glen glen at pld-linux.org
Wed Mar 23 15:54:27 CET 2011


Author: glen                         Date: Wed Mar 23 14:54:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 7.3.143

---- Files affected:
packages/vim:
   vim.spec (1.549 -> 1.550) , 7.3.126 (NONE -> 1.1)  (NEW), 7.3.127 (NONE -> 1.1)  (NEW), 7.3.128 (NONE -> 1.1)  (NEW), 7.3.129 (NONE -> 1.1)  (NEW), 7.3.130 (NONE -> 1.1)  (NEW), 7.3.131 (NONE -> 1.1)  (NEW), 7.3.132 (NONE -> 1.1)  (NEW), 7.3.133 (NONE -> 1.1)  (NEW), 7.3.134 (NONE -> 1.1)  (NEW), 7.3.135 (NONE -> 1.1)  (NEW), 7.3.136 (NONE -> 1.1)  (NEW), 7.3.137 (NONE -> 1.1)  (NEW), 7.3.138 (NONE -> 1.1)  (NEW), 7.3.139 (NONE -> 1.1)  (NEW), 7.3.140 (NONE -> 1.1)  (NEW), 7.3.141 (NONE -> 1.1)  (NEW), 7.3.142 (NONE -> 1.1)  (NEW), 7.3.143 (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.549 packages/vim/vim.spec:1.550
--- packages/vim/vim.spec:1.549	Wed Feb 16 10:47:10 2011
+++ packages/vim/vim.spec	Wed Mar 23 15:54:21 2011
@@ -26,8 +26,8 @@
 # curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}'
 
 %define		ver		7.3
-%define		patchlevel	125
-%define		rel			2
+%define		patchlevel	143
+%define		rel			1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
 Summary(es.UTF-8):	Editor visual incrementado
@@ -1395,6 +1395,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.550  2011/03/23 14:54:21  glen
+- up to 7.3.143
+
 Revision 1.549  2011/02/16 09:47:10  glen
 - up to 7.3.125
 

================================================================
Index: packages/vim/7.3.126
diff -u /dev/null packages/vim/7.3.126:1.1
--- /dev/null	Wed Mar 23 15:54:27 2011
+++ packages/vim/7.3.126	Wed Mar 23 15:54:21 2011
@@ -0,0 +1,63 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.126
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.126
+Problem:    Compiler warning for signed pointer.
+Solution:   Use unsigned int argument for sscanf().
+Files:	    src/blowfish.c
+
+
+*** ../vim-7.3.125/src/blowfish.c	2010-08-15 21:57:28.000000000 +0200
+--- src/blowfish.c	2010-12-17 19:58:18.000000000 +0100
+***************
+*** 413,418 ****
+--- 413,419 ----
+      int    salt_len;
+  {
+      int      i, j, keypos = 0;
++     unsigned u;
+      UINT32_T val, data_l, data_r;
+      char_u   *key;
+      int      keylen;
+***************
+*** 432,439 ****
+      }
+      for (i = 0; i < keylen; i++)
+      {
+! 	sscanf((char *)&key[i * 2], "%2x", &j);
+! 	key[i] = j;
+      }
+  
+      mch_memmove(sbx, sbi, 4 * 4 * 256);
+--- 433,440 ----
+      }
+      for (i = 0; i < keylen; i++)
+      {
+! 	sscanf((char *)&key[i * 2], "%2x", &u);
+! 	key[i] = u;
+      }
+  
+      mch_memmove(sbx, sbi, 4 * 4 * 256);
+*** ../vim-7.3.125/src/version.c	2011-02-15 18:06:11.000000000 +0100
+--- src/version.c	2011-02-25 14:40:22.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     126,
+  /**/
+
+-- 
+Why doesn't Tarzan have a beard?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.127
diff -u /dev/null packages/vim/7.3.127:1.1
--- /dev/null	Wed Mar 23 15:54:27 2011
+++ packages/vim/7.3.127	Wed Mar 23 15:54:21 2011
@@ -0,0 +1,55 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.127
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.127
+Problem:    Compiler complains about comma.
+Solution:   Remove comma after last enum element.
+Files:	    src/ex_cmds2.c
+
+
+*** ../vim-7.3.126/src/ex_cmds2.c	2010-12-17 18:06:00.000000000 +0100
+--- src/ex_cmds2.c	2010-12-17 19:58:37.000000000 +0100
+***************
+*** 1115,1121 ****
+  static enum
+  {
+      PEXP_SUBCMD,	/* expand :profile sub-commands */
+!     PEXP_FUNC,		/* expand :profile func {funcname} */
+  } pexpand_what;
+  
+  static char *pexpand_cmds[] = {
+--- 1115,1121 ----
+  static enum
+  {
+      PEXP_SUBCMD,	/* expand :profile sub-commands */
+!     PEXP_FUNC		/* expand :profile func {funcname} */
+  } pexpand_what;
+  
+  static char *pexpand_cmds[] = {
+*** ../vim-7.3.126/src/version.c	2011-02-25 14:40:51.000000000 +0100
+--- src/version.c	2011-02-25 14:45:19.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     127,
+  /**/
+
+-- 
+   LAUNCELOT leaps into SHOT with a mighty cry and runs the GUARD through and
+   hacks him to the floor.  Blood.  Swashbuckling music (perhaps).
+   LAUNCELOT races through into the castle screaming.
+SECOND SENTRY: Hey!
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.128
diff -u /dev/null packages/vim/7.3.128:1.1
--- /dev/null	Wed Mar 23 15:54:27 2011
+++ packages/vim/7.3.128	Wed Mar 23 15:54:21 2011
@@ -0,0 +1,58 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.128
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.128
+Problem:    Another compiler warning for signed pointer.
+Solution:   Use unsigned int argument for sscanf().
+Files:	    src/mark.c
+
+
+*** ../vim-7.3.127/src/mark.c	2010-08-15 21:57:25.000000000 +0200
+--- src/mark.c	2010-12-17 20:00:05.000000000 +0100
+***************
+*** 1750,1756 ****
+  	    {
+  		if (line[1] != NUL)
+  		{
+! 		    sscanf((char *)line + 2, "%ld %u", &pos.lnum, &pos.col);
+  		    switch (line[1])
+  		    {
+  			case '"': curbuf->b_last_cursor = pos; break;
+--- 1750,1759 ----
+  	    {
+  		if (line[1] != NUL)
+  		{
+! 		    unsigned u;
+! 
+! 		    sscanf((char *)line + 2, "%ld %u", &pos.lnum, &u);
+! 		    pos.col = u;
+  		    switch (line[1])
+  		    {
+  			case '"': curbuf->b_last_cursor = pos; break;
+*** ../vim-7.3.127/src/version.c	2011-02-25 14:46:06.000000000 +0100
+--- src/version.c	2011-02-25 15:10:34.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     128,
+  /**/
+
+-- 
+FATHER:    Who are you?
+PRINCE:    I'm ... your son ...
+FATHER:    Not you.
+LAUNCELOT: I'm ... er ... Sir Launcelot, sir.
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.129
diff -u /dev/null packages/vim/7.3.129:1.1
--- /dev/null	Wed Mar 23 15:54:27 2011
+++ packages/vim/7.3.129	Wed Mar 23 15:54:21 2011
@@ -0,0 +1,241 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.129
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.129
+Problem:    Using integer like a boolean.
+Solution:   Nicer check for integer being non-zero.
+Files:	    src/tag.c
+
+
+*** ../vim-7.3.128/src/tag.c	2010-12-17 18:06:00.000000000 +0100
+--- src/tag.c	2010-12-17 17:49:35.000000000 +0100
+***************
+*** 204,210 ****
+      else
+      {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview)
+  	    use_tagstack = FALSE;
+  	else
+  #endif
+--- 204,210 ----
+      else
+      {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0)
+  	    use_tagstack = FALSE;
+  	else
+  #endif
+***************
+*** 222,228 ****
+  		    ))
+  	{
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    if (g_do_tagpreview)
+  	    {
+  		if (ptag_entry.tagname != NULL
+  			&& STRCMP(ptag_entry.tagname, tag) == 0)
+--- 222,228 ----
+  		    ))
+  	{
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    if (g_do_tagpreview != 0)
+  	    {
+  		if (ptag_entry.tagname != NULL
+  			&& STRCMP(ptag_entry.tagname, tag) == 0)
+***************
+*** 278,284 ****
+  	{
+  	    if (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		    g_do_tagpreview ? ptag_entry.tagname == NULL :
+  #endif
+  		    tagstacklen == 0)
+  	    {
+--- 278,284 ----
+  	{
+  	    if (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		    g_do_tagpreview != 0 ? ptag_entry.tagname == NULL :
+  #endif
+  		    tagstacklen == 0)
+  	    {
+***************
+*** 361,367 ****
+  	       )
+  	    {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+--- 361,367 ----
+  	       )
+  	    {
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview != 0)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+***************
+*** 399,405 ****
+  		prevtagstackidx = tagstackidx;
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+--- 399,405 ----
+  		prevtagstackidx = tagstackidx;
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 		if (g_do_tagpreview != 0)
+  		{
+  		    cur_match = ptag_entry.cur_match;
+  		    cur_fnum = ptag_entry.cur_fnum;
+***************
+*** 437,443 ****
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview)
+  	{
+  	    if (type != DT_SELECT && type != DT_JUMP)
+  	    {
+--- 437,443 ----
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0)
+  	{
+  	    if (type != DT_SELECT && type != DT_JUMP)
+  	    {
+***************
+*** 492,498 ****
+  	if (use_tagstack)
+  	    name = tagstack[tagstackidx].tagname;
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	else if (g_do_tagpreview)
+  	    name = ptag_entry.tagname;
+  #endif
+  	else
+--- 492,498 ----
+  	if (use_tagstack)
+  	    name = tagstack[tagstackidx].tagname;
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	else if (g_do_tagpreview != 0)
+  	    name = ptag_entry.tagname;
+  #endif
+  	else
+***************
+*** 620,626 ****
+  		    parse_match(matches[i], &tagp);
+  		    if (!new_tag && (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 				(g_do_tagpreview
+  				 && i == ptag_entry.cur_match) ||
+  #endif
+  				(use_tagstack
+--- 620,626 ----
+  		    parse_match(matches[i], &tagp);
+  		    if (!new_tag && (
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 				(g_do_tagpreview != 0
+  				 && i == ptag_entry.cur_match) ||
+  #endif
+  				(use_tagstack
+***************
+*** 962,968 ****
+  		++tagstackidx;
+  	    }
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    else if (g_do_tagpreview)
+  	    {
+  		ptag_entry.cur_match = cur_match;
+  		ptag_entry.cur_fnum = cur_fnum;
+--- 962,968 ----
+  		++tagstackidx;
+  	    }
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	    else if (g_do_tagpreview != 0)
+  	    {
+  		ptag_entry.cur_match = cur_match;
+  		ptag_entry.cur_fnum = cur_fnum;
+***************
+*** 3110,3116 ****
+  #endif
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+!     if (g_do_tagpreview)
+      {
+  	postponed_split = 0;	/* don't split again below */
+  	curwin_save = curwin;	/* Save current window */
+--- 3110,3116 ----
+  #endif
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+!     if (g_do_tagpreview != 0)
+      {
+  	postponed_split = 0;	/* don't split again below */
+  	curwin_save = curwin;	/* Save current window */
+***************
+*** 3148,3154 ****
+  	/* A :ta from a help file will keep the b_help flag set.  For ":ptag"
+  	 * we need to use the flag from the window where we came from. */
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview)
+  	    keep_help_flag = curwin_save->w_buffer->b_help;
+  	else
+  #endif
+--- 3148,3154 ----
+  	/* A :ta from a help file will keep the b_help flag set.  For ":ptag"
+  	 * we need to use the flag from the window where we came from. */
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0)
+  	    keep_help_flag = curwin_save->w_buffer->b_help;
+  	else
+  #endif
+***************
+*** 3322,3328 ****
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview && curwin != curwin_save && win_valid(curwin_save))
+  	{
+  	    /* Return cursor to where we were */
+  	    validate_cursor();
+--- 3322,3329 ----
+  	}
+  
+  #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
+! 	if (g_do_tagpreview != 0
+! 			   && curwin != curwin_save && win_valid(curwin_save))
+  	{
+  	    /* Return cursor to where we were */
+  	    validate_cursor();
+*** ../vim-7.3.128/src/version.c	2011-02-25 15:11:17.000000000 +0100
+--- src/version.c	2011-02-25 15:12:25.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     129,
+  /**/
+
+-- 
+PRINCE:    He's come to rescue me, father.
+LAUNCELOT: (embarrassed) Well, let's not jump to conclusions ...
+                 "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/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.130
diff -u /dev/null packages/vim/7.3.130:1.1
--- /dev/null	Wed Mar 23 15:54:27 2011
+++ packages/vim/7.3.130	Wed Mar 23 15:54:21 2011
@@ -0,0 +1,74 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.130
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.130
+Problem:    Variable misplaced in #ifdef.
+Solution:   Move clipboard_event_time outside of #ifdef.
+Files:	    src/gui_gtk_x11.c
+
+
+*** ../vim-7.3.129/src/gui_gtk_x11.c	2010-08-15 21:57:31.000000000 +0200
+--- src/gui_gtk_x11.c	2010-12-04 15:26:41.000000000 +0100
+***************
+*** 86,94 ****
+  
+  #ifdef HAVE_X11_SUNKEYSYM_H
+  # include <X11/Sunkeysym.h>
+- static guint32 clipboard_event_time = CurrentTime;
+  #endif
+  
+  /*
+   * Easy-to-use macro for multihead support.
+   */
+--- 86,95 ----
+  
+  #ifdef HAVE_X11_SUNKEYSYM_H
+  # include <X11/Sunkeysym.h>
+  #endif
+  
++ static guint32 clipboard_event_time = CurrentTime;
++ 
+  /*
+   * Easy-to-use macro for multihead support.
+   */
+***************
+*** 5419,5425 ****
+  	}
+  
+  #if defined(FEAT_NETBEANS_INTG)
+! 	/* Process the queued netbeans messages. */
+  	netbeans_parse_messages();
+  #endif
+  
+--- 5420,5426 ----
+  	}
+  
+  #if defined(FEAT_NETBEANS_INTG)
+! 	/* Process any queued netbeans messages. */
+  	netbeans_parse_messages();
+  #endif
+  
+*** ../vim-7.3.129/src/version.c	2011-02-25 15:13:43.000000000 +0100
+--- src/version.c	2011-02-25 15:15:02.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     130,
+  /**/
+
+-- 
+A vacation is a period of travel during which you find that you
+took twice as many clothes and half as much money as you needed.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

================================================================
Index: packages/vim/7.3.131
diff -u /dev/null packages/vim/7.3.131:1.1
--- /dev/null	Wed Mar 23 15:54:27 2011
+++ packages/vim/7.3.131	Wed Mar 23 15:54:21 2011
@@ -0,0 +1,47 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.131
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.131
+Problem:    Including errno.h too often.
+Solution:   Don't include errno.h in Unix header file.
+Files:	    src/os_unix.h
+
+
+*** ../vim-7.3.130/src/os_unix.h	2010-08-15 21:57:28.000000000 +0200
+--- src/os_unix.h	2010-12-17 20:05:34.000000000 +0100
+***************
+*** 184,193 ****
+  
+  #define BASENAMELEN	(MAXNAMLEN - 5)
+  
+- #ifdef HAVE_ERRNO_H
+- # include <errno.h>
+- #endif
+- 
+  #ifdef HAVE_PWD_H
+  # include <pwd.h>
+  #endif
+--- 184,189 ----
+*** ../vim-7.3.130/src/version.c	2011-02-25 15:15:43.000000000 +0100
+--- src/version.c	2011-02-25 15:16:49.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+  {   /* Add new patch number below this line */
++ /**/
++     131,
+  /**/
+
+-- 
+Overflow on /dev/null, please empty the bit bucket.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.549&r2=1.550&f=u



More information about the pld-cvs-commit mailing list