Merge branch 'master' of ssh://pkgs.fedoraproject.org/vim

Conflicts:
	vim.spec
This commit is contained in:
Karsten Hopp 2015-03-09 14:09:35 +01:00
commit 46d49d7b9e
2 changed files with 4 additions and 1 deletions

View File

@ -2048,6 +2048,9 @@ rm -rf %{buildroot}
* Fri Feb 27 2015 Karsten Hopp <karsten@redhat.com> 7.4.643-1 * Fri Feb 27 2015 Karsten Hopp <karsten@redhat.com> 7.4.643-1
- patchlevel 643 - patchlevel 643
* Mon Mar 02 2015 Dave Airlie <airlied@redhat.com> 7.4.640-4
- fix vimrc using wrong comment character
* Thu Feb 26 2015 Karsten Hopp <karsten@redhat.com> 7.4.640-3 * Thu Feb 26 2015 Karsten Hopp <karsten@redhat.com> 7.4.640-3
- bump release - bump release

2
vimrc
View File

@ -59,7 +59,7 @@ if &term=="xterm"
set t_Sf=[3%dm set t_Sf=[3%dm
endif endif
# rhbz 1159920 " rhbz 1159920
if $COLORTERM=="gnome-terminal" if $COLORTERM=="gnome-terminal"
set background=light set background=light
else else