From 3109f8435a0df8fa928cea454339bd23045c7e52 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Mar 11 2008 12:49:59 +0000 Subject: - patchlevel 270 - don't write swapfile on most common locations for USB-sticks (#436752) --- diff --git a/7.1.270 b/7.1.270 new file mode 100644 index 0000000..d2563c8 --- /dev/null +++ b/7.1.270 @@ -0,0 +1,94 @@ +To: vim-dev@vim.org +Subject: Patch 7.1.270 +Fcc: outbox +From: Bram Moolenaar +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@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 /// diff --git a/README.patches b/README.patches index ae4f7f2..a2910de 100644 --- a/README.patches +++ b/README.patches @@ -301,3 +301,4 @@ Individual patches for Vim 7.1: 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 diff --git a/vim.spec b/vim.spec index d448cc5..9a13acd 100644 --- a/vim.spec +++ b/vim.spec @@ -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 @@ Patch266: ftp://ftp.vim.org/pub/vim/patches/7.1/7.1.266 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 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch267 -p0 %patch268 -p0 %patch269 -p0 +%patch270 -p0 # install spell files @@ -1130,6 +1132,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Tue Mar 11 2008 Karsten Hopp 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 7.1.269-2 - BR: ExtUtils::Embed to find perl headers diff --git a/vimrc b/vimrc index 8da18fb..5eaf262 100644 --- a/vimrc +++ b/vimrc @@ -20,6 +20,8 @@ if has("autocmd") \ 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")