devel/vim 7.1.270, NONE, 1.1 README.patches, 1.99, 1.100 vim.spec, 1.197, 1.198 vimrc, 1.17, 1.18

Karsten Hopp (karsten) fedora-extras-commits at redhat.com
Tue Mar 11 12:50:38 UTC 2008


Author: karsten

Update of /cvs/extras/devel/vim
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18012

Modified Files:
	README.patches vim.spec vimrc 
Added Files:
	7.1.270 
Log Message:
- patchlevel 270
- don't write swapfile on most common locations for USB-sticks (#436752)



--- NEW FILE 7.1.270 ---
To: vim-dev at vim.org
Subject: Patch 7.1.270
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.270
Problem:    ":?foo?" matches in current line since patch 7.1.025. (A.Politz)
Solution:   Remove the SEARCH_START flag.
Files:	    src/ex_docmd.c, src/search.c


*** ../vim-7.1.269/src/ex_docmd.c	Tue Feb 26 21:29:06 2008
--- src/ex_docmd.c	Sun Mar  2 20:50:43 2008
***************
*** 3932,3939 ****
  				curwin->w_cursor.col = 0;
  			    searchcmdlen = 0;
  			    if (!do_search(NULL, c, cmd, 1L,
! 					SEARCH_HIS + SEARCH_MSG + SEARCH_START,
! 					NULL))
  			    {
  				curwin->w_cursor = pos;
  				cmd = NULL;
--- 3932,3938 ----
  				curwin->w_cursor.col = 0;
  			    searchcmdlen = 0;
  			    if (!do_search(NULL, c, cmd, 1L,
! 					       SEARCH_HIS | SEARCH_MSG, NULL))
  			    {
  				curwin->w_cursor = pos;
  				cmd = NULL;
***************
*** 3980,3987 ****
  				pos.col = 0;
  			    if (searchit(curwin, curbuf, &pos,
  					*cmd == '?' ? BACKWARD : FORWARD,
! 					(char_u *)"", 1L,
! 					SEARCH_MSG + SEARCH_START,
  						i, (linenr_T)0, NULL) != FAIL)
  				lnum = pos.lnum;
  			    else
--- 3979,3985 ----
  				pos.col = 0;
  			    if (searchit(curwin, curbuf, &pos,
  					*cmd == '?' ? BACKWARD : FORWARD,
! 					(char_u *)"", 1L, SEARCH_MSG,
  						i, (linenr_T)0, NULL) != FAIL)
  				lnum = pos.lnum;
  			    else
*** ../vim-7.1.269/src/search.c	Wed Feb 20 13:41:14 2008
--- src/search.c	Sun Mar  2 22:00:50 2008
***************
*** 538,544 ****
  	return FAIL;
      }
  
!     if (options & SEARCH_START)
  	extra_col = 0;
  #ifdef FEAT_MBYTE
      /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
--- 538,547 ----
  	return FAIL;
      }
  
!     /* When not accepting a match at the start position set "extra_col" to a
!      * non-zero value.  Don't do that when starting at MAXCOL, since MAXCOL +
!      * 1 is zero. */
!     if ((options & SEARCH_START) || pos->col == MAXCOL)
  	extra_col = 0;
  #ifdef FEAT_MBYTE
      /* Watch out for the "col" being MAXCOL - 2, used in a closed fold. */
*** ../vim-7.1.269/src/version.c	Sun Mar  9 16:45:16 2008
--- src/version.c	Mon Mar 10 21:32:07 2008
***************
*** 668,669 ****
--- 668,671 ----
  {   /* Add new patch number below this line */
+ /**/
+     270,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
102. When filling out your driver's license application, you give
     your IP address.

 /// 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/extras/devel/vim/README.patches,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- README.patches	10 Mar 2008 12:18:00 -0000	1.99
+++ README.patches	11 Mar 2008 12:49:59 -0000	1.100
@@ -301,3 +301,4 @@
   1957  7.1.267  when changing folds cursor may be positioned in a wrong place
   1576  7.1.268  always shows "+" at end of screen line with 'cursurline'
   6183  7.1.269  matchparen plugin has an arbitrary line number limit
+  2861  7.1.270  ":?foo?" matches in current line since patch 7.1.025


Index: vim.spec
===================================================================
RCS file: /cvs/extras/devel/vim/vim.spec,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- vim.spec	10 Mar 2008 14:17:23 -0000	1.197
+++ vim.spec	11 Mar 2008 12:49:59 -0000	1.198
@@ -18,13 +18,13 @@
 #used for pre-releases:
 %define beta %{nil}
 %define vimdir vim71%{?beta}
-%define patchlevel 269
+%define patchlevel 270
 
 Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{beta}%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}%{?beta}%{?CVSDATE}.tar.bz2
@@ -323,6 +323,7 @@
 Patch267: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.267
 Patch268: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.268
 Patch269: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.269
+Patch270: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.270
 
 Patch3000: vim-7.0-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -728,6 +729,7 @@
 %patch267 -p0
 %patch268 -p0
 %patch269 -p0
+%patch270 -p0
 
 
 # install spell files
@@ -1130,6 +1132,10 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Mar 11 2008 Karsten Hopp <karsten at redhat.com> 7.1.270-1
+- patchlevel 270
+- don't write swapfile on most common locations for USB-sticks (#436752)
+
 * Mon Mar 10 2008 Tom "spot" Callaway <tcallawa at redhat.com> 7.1.269-2
 - BR: ExtUtils::Embed to find perl headers
 


Index: vimrc
===================================================================
RCS file: /cvs/extras/devel/vim/vimrc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- vimrc	25 Feb 2008 15:27:41 -0000	1.17
+++ vimrc	11 Mar 2008 12:49:59 -0000	1.18
@@ -20,6 +20,8 @@
   \ if line("'\"") > 0 && line ("'\"") <= line("$") |
   \   exe "normal! g'\"" |
   \ endif
+  " don't write swapfile on most commonly used directories for NFS mounts or USB sticks
+  autocmd BufNewFile,BufReadPre /media/*,/mnt/* set directory=~/tmp,/var/tmp,/tmp
 endif
 
 if has("cscope") && filereadable("/usr/bin/cscope")




More information about the fedora-extras-commits mailing list