summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2010-03-09 18:47:26 +0000
committerJim Ramsay <lack@gentoo.org>2010-03-09 18:47:26 +0000
commitac1450aca2e8911d02b2bb924a513656c51f7853 (patch)
treed3fa2b727bda7da7ef17c6f027e70c5fd53d211a /app-editors/vim-core
parentRevbump for EAPI=3, Prefix fixes, transferred Prefix keywords (diff)
downloadgentoo-2-ac1450aca2e8911d02b2bb924a513656c51f7853.tar.gz
gentoo-2-ac1450aca2e8911d02b2bb924a513656c51f7853.tar.bz2
gentoo-2-ac1450aca2e8911d02b2bb924a513656c51f7853.zip
Fix /etc/vim/vimrc so it does not accidentally override last-position-jump (Bug #308545)
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/vim-core')
-rw-r--r--app-editors/vim-core/ChangeLog6
-rw-r--r--app-editors/vim-core/files/vimrc-r44
2 files changed, 7 insertions, 3 deletions
diff --git a/app-editors/vim-core/ChangeLog b/app-editors/vim-core/ChangeLog
index 7f1426c7169d..df7628922fea 100644
--- a/app-editors/vim-core/ChangeLog
+++ b/app-editors/vim-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/vim-core
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.325 2010/02/24 16:55:51 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/ChangeLog,v 1.326 2010/03/09 18:47:26 lack Exp $
+
+ 09 Mar 2010; Jim Ramsay <lack@gentoo.org> files/vimrc-r4:
+ Fix /etc/vim/vimrc so it does not accidentally override last-position-jump
+ (Bug #308545)
*vim-core-7.2.376 (24 Feb 2010)
diff --git a/app-editors/vim-core/files/vimrc-r4 b/app-editors/vim-core/files/vimrc-r4
index 39f178bd040d..5273ff3248e2 100644
--- a/app-editors/vim-core/files/vimrc-r4
+++ b/app-editors/vim-core/files/vimrc-r4
@@ -2,7 +2,7 @@ scriptencoding utf-8
" ^^ Please leave the above line at the start of the file.
" Default configuration file for Vim
-" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.1 2009/07/22 14:05:52 lack Exp $
+" $Header: /var/cvsroot/gentoo-x86/app-editors/vim-core/files/vimrc-r4,v 1.2 2010/03/09 18:47:21 lack Exp $
" Written by Aron Griffis <agriffis@gentoo.org>
" Modified by Ryan Phillips <rphillips@gentoo.org>
@@ -181,7 +181,7 @@ augroup gentoo
" Except of course if a byte-order mark is in effect.
autocmd BufReadPost *
\ if exists("g:added_fenc_utf8") && &fileencoding == "utf-8" &&
- \ ! &bomb && search('[\x80-\xFF]','w') == 0 && &modifiable |
+ \ ! &bomb && search('[\x80-\xFF]','nw') == 0 && &modifiable |
\ set fileencoding= |
\ endif