rpms/vim/devel 7.0.006, NONE, 1.1 7.0.007, NONE, 1.1 7.0.008, NONE, 1.1 7.0.009, NONE, 1.1 7.0.010, NONE, 1.1 README.patches, 1.41, 1.42 vim.spec, 1.114, 1.115

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu May 11 08:39:28 UTC 2006


Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6968

Modified Files:
	README.patches vim.spec 
Added Files:
	7.0.006 7.0.007 7.0.008 7.0.009 7.0.010 
Log Message:
- patchlevel 010


--- NEW FILE 7.0.006 ---
To: vim-dev at vim.org
Subject: Patch 7.0.006
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.006
Problem:    Mac: "make shadow" doesn't make a link for infplist.xml. (Axel
	    Kielhorn)
Solution:   Make the link.
Files:	    src/Makefile


*** ../vim-7.0.005/src/Makefile	Wed May 10 15:22:49 2006
--- src/Makefile	Wed May 10 17:26:19 2006
***************
*** 2177,2182 ****
--- 2177,2183 ----
  	cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
  	if test -d $(RSRC_DIR); then \
  		cd $(SHADOWDIR); \
+ 		ln -s ../infplist.xml .; \
  		ln -s ../$(RSRC_DIR) ../os_mac.rsr.hqx ../dehqx.py .; \
  	fi
  	mkdir $(SHADOWDIR)/testdir
*** ../vim-7.0.005/src/version.c	Wed May 10 17:24:26 2006
--- src/version.c	Wed May 10 17:26:09 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     6,
  /**/

-- 
>From "know your smileys":
 @:-()	Elvis Presley

 /// 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    ///


--- NEW FILE 7.0.007 ---
To: vim-dev at vim.org
Subject: Patch 7.0.007
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.007
Problem:    AIX: compiling fails for message.c. (Ruediger Hornig)
Solution:   Move the #if outside of memchr().
Files:	    src/message.c


*** ../vim-7.0.006/src/message.c	Wed May 10 15:22:50 2006
--- src/message.c	Tue May  9 10:36:56 2006
***************
*** 4175,4189 ****
  			str_arg_l = 0;
  		    else
  		    {
! 			/* memchr on HP does not like n > 2^31  !!! */
! 			char *q = memchr(str_arg, '\0',
  #if SIZEOF_INT <= 2
! 				precision
  #else
! 				precision <= (size_t)0x7fffffffL ? precision
! 						       : (size_t)0x7fffffffL
  #endif
- 						       );
  			str_arg_l = (q == NULL) ? precision : q - str_arg;
  		    }
  		    break;
--- 4175,4190 ----
  			str_arg_l = 0;
  		    else
  		    {
! 			/* Don't put the #if inside memchr(), it can be a
! 			 * macro. */
  #if SIZEOF_INT <= 2
! 			char *q = memchr(str_arg, '\0', precision);
  #else
! 			/* memchr on HP does not like n > 2^31  !!! */
! 			char *q = memchr(str_arg, '\0',
! 				  precision <= (size_t)0x7fffffffL ? precision
! 						       : (size_t)0x7fffffffL);
  #endif
  			str_arg_l = (q == NULL) ? precision : q - str_arg;
  		    }
  		    break;
*** ../vim-7.0.006/src/version.c	Wed May 10 17:26:37 2006
--- src/version.c	Wed May 10 17:36:03 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     7,
  /**/

-- 
Momento mori, ergo carpe diem

 /// 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    ///


--- NEW FILE 7.0.008 ---
To: vim-dev at vim.org
Subject: Patch 7.0.008
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.008
Problem:    Can't call a function that uses both <SID> and {expr}. (Thomas)
Solution:   Check both the expanded and unexpanded name for <SID>.
Files:	    src/eval.c


*** ../vim-7.0.007/src/eval.c	Wed May 10 15:22:49 2006
--- src/eval.c	Wed May 10 12:11:42 2006
***************
*** 11372,11378 ****
  	    if (argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
! 		int		xp_namelen;
  		long	argt;
  
  		rettv->vval.v_string = NULL;
--- 11372,11378 ----
  	    if (argvars[2].v_type != VAR_UNKNOWN)
  	    {
  		char_u	*xp_name;
! 		int	xp_namelen;
  		long	argt;
  
  		rettv->vval.v_string = NULL;
***************
*** 18963,18969 ****
      else if (lead > 0)
      {
  	lead = 3;
! 	if (eval_fname_sid(lv.ll_exp_name != NULL ? lv.ll_exp_name : *pp))
  	{
  	    /* It's "s:" or "<SID>" */
  	    if (current_SID <= 0)
--- 18963,18970 ----
      else if (lead > 0)
      {
  	lead = 3;
! 	if ((lv.ll_exp_name != NULL && eval_fname_sid(lv.ll_exp_name))
! 						       || eval_fname_sid(*pp))
  	{
  	    /* It's "s:" or "<SID>" */
  	    if (current_SID <= 0)
*** ../vim-7.0.007/src/version.c	Wed May 10 17:38:05 2006
--- src/version.c	Wed May 10 17:39:46 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     8,
  /**/

-- 
>From "know your smileys":
 %	Bike accident.  A bit far-fetched, I suppose; although...
             o      _     _         _
     _o     /\_   _ \\o  (_)\__/o  (_)
   _< \_   _>(_) (_)/<_    \_| \   _|/' \/
  (_)>(_) (_)        (_)   (_)    (_)'  _\o_

 /// 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    ///


--- NEW FILE 7.0.009 ---
To: vim-dev at vim.org
Subject: Patch 7.0.009
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.009
Problem:    ml_get errors with both 'sidescroll' and 'spell' set.
Solution:   Use ml_get_buf() instead of ml_get(), get the line from the right
	    buffer, not the current one.
Files:	    src/spell.c


*** ../vim-7.0.008/src/spell.c	Wed May 10 15:22:50 2006
--- src/spell.c	Tue May  9 18:55:04 2006
***************
*** 2108,2114 ****
  	 * possible. */
  	STRCPY(buf, line);
  	if (lnum < wp->w_buffer->b_ml.ml_line_count)
! 	    spell_cat_line(buf + STRLEN(buf), ml_get(lnum + 1), MAXWLEN);
  
  	p = buf + skip;
  	endp = buf + len;
--- 2108,2115 ----
  	 * possible. */
  	STRCPY(buf, line);
  	if (lnum < wp->w_buffer->b_ml.ml_line_count)
! 	    spell_cat_line(buf + STRLEN(buf),
! 			  ml_get_buf(wp->w_buffer, lnum + 1, FALSE), MAXWLEN);
  
  	p = buf + skip;
  	endp = buf + len;
*** ../vim-7.0.008/src/version.c	Wed May 10 17:40:17 2006
--- src/version.c	Wed May 10 17:50:20 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     9,
  /**/

-- 
I AM THANKFUL...
...for the taxes that I pay because it means that I am employed.

 /// 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    ///


--- NEW FILE 7.0.010 ---
To: vim-dev at vim.org
Subject: Patch 7.0.010
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.010
Problem:    The spellfile plugin required typing login name and password.
Solution:   Use "anonymous" and "vim7user" by default.  No need to setup a
	    .netrc file.
Files:	    runtime/autoload/spellfile.vim


*** ../vim-7.0.009/runtime/autoload/spellfile.vim	Wed May 10 15:22:54 2006
--- runtime/autoload/spellfile.vim	Wed May 10 17:55:15 2006
***************
*** 1,9 ****
  " Vim script to download a missing spell file
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 Feb 01
  
  if !exists('g:spellfile_URL')
!   let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/unstable/runtime/spell'
  endif
  let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
  
--- 1,9 ----
  " Vim script to download a missing spell file
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
! " Last Change:	2006 May 10
  
  if !exists('g:spellfile_URL')
!   let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
  endif
  let s:spellfile_URL = ''    " Start with nothing so that s:donedict is reset.
  
***************
*** 61,73 ****
      new
      setlocal bin
      echo 'Downloading ' . fname . '...'
!     exe 'Nread ' g:spellfile_URL . '/' . fname
      if getline(2) !~ 'VIMspell'
        " Didn't work, perhaps there is an ASCII one.
        g/^/d
        let fname = a:lang . '.ascii.spl'
        echo 'Could not find it, trying ' . fname . '...'
!       exe 'Nread ' g:spellfile_URL . '/' . fname
        if getline(2) !~ 'VIMspell'
  	echo 'Sorry, downloading failed'
  	bwipe!
--- 61,73 ----
      new
      setlocal bin
      echo 'Downloading ' . fname . '...'
!     call spellfile#Nread(fname)
      if getline(2) !~ 'VIMspell'
        " Didn't work, perhaps there is an ASCII one.
        g/^/d
        let fname = a:lang . '.ascii.spl'
        echo 'Could not find it, trying ' . fname . '...'
!       call spellfile#Nread(fname)
        if getline(2) !~ 'VIMspell'
  	echo 'Sorry, downloading failed'
  	bwipe!
***************
*** 95,101 ****
  	g/^/d
  	let fname = substitute(fname, '\.spl$', '.sug', '')
  	echo 'Downloading ' . fname . '...'
! 	exe 'Nread ' g:spellfile_URL . '/' . fname
  	if getline(2) !~ 'VIMsug'
  	  echo 'Sorry, downloading failed'
  	else
--- 95,101 ----
  	g/^/d
  	let fname = substitute(fname, '\.spl$', '.sug', '')
  	echo 'Downloading ' . fname . '...'
! 	call spellfile#Nread(fname)
  	if getline(2) !~ 'VIMsug'
  	  echo 'Sorry, downloading failed'
  	else
***************
*** 108,111 ****
--- 108,118 ----
  
      bwipe
    endif
+ endfunc
+ 
+ " Read "fname" from the ftp server.
+ function! spellfile#Nread(fname)
+   let machine = substitute(g:spellfile_URL, 'ftp://\([^/]*\).*', '\1', '')
+   let dir = substitute(g:spellfile_URL, 'ftp://[^/]*/\(.*\)', '\1', '')
+   exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
  endfunc
*** ../vim-7.0.009/src/version.c	Wed May 10 17:51:22 2006
--- src/version.c	Wed May 10 17:53:53 2006
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     10,
  /**/

-- 
I AM THANKFUL...
...for the mess to clean after a party because it means I have
been surrounded by friends.

 /// 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: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- README.patches	10 May 2006 15:23:43 -0000	1.41
+++ README.patches	11 May 2006 08:39:25 -0000	1.42
@@ -30,3 +30,8 @@
   1876  7.0.003  GUI: click in tab pages label may warp mouse pointer
   1596  7.0.004  Compiler warning for debug_saved used before set
   1579  7.0.005  (extra) Win32: uninstall didn't delete spell and autoload dirs
+  1347  7.0.006  Mac: "make shadow" didn't link infplist.xml
+  1919  7.0.007  AIX: compiling failed for message.c
+  2081  7.0.008  Can't call a function that uses both <SID> and {expr}
+  1625  7.0.009  ml_get errors when 'spell' is set
+  3705  7.0.010  spellfile plugin required typing login name and password


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- vim.spec	10 May 2006 15:23:43 -0000	1.114
+++ vim.spec	11 May 2006 08:39:25 -0000	1.115
@@ -24,12 +24,12 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim70%{?beta}
-%define patchlevel 005
+%define patchlevel 010
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -59,6 +59,12 @@
 Patch003: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.003
 Patch004: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.004
 Patch005: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.005
+Patch006: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.006
+Patch007: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.007
+Patch008: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.008
+Patch009: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.009
+Patch010: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010
+
 
 Patch3000: vim-7.0-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -192,6 +198,12 @@
 %patch004 -p0
 # Win32:
 #patch005 -p0
+# MAC:
+#patch006 -p0
+%patch007 -p0
+%patch008 -p0
+%patch009 -p0
+%patch010 -p0
 
 %patch3000 -p1
 %patch3001 -p1
@@ -528,6 +540,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Thu May 11 2006 Karsten Hopp <karsten at redhat.de> 7.0.010-1
+- patchlevel 010
+
 * Wed May 10 2006 Karsten Hopp <karsten at redhat.de> 7.0.005-2
 - patchlevel 005
 - move older changelogs (<7.0) into a file, no need to keep them 




More information about the fedora-cvs-commits mailing list