rpms/vim/devel 7.2.023, NONE, 1.1 7.2.024, NONE, 1.1 7.2.025, NONE, 1.1 README.patches, 1.112, 1.113 gvim.desktop, 1.6, 1.7 vim.spec, 1.221, 1.222
Karsten Hopp
karsten at fedoraproject.org
Mon Oct 20 13:29:23 UTC 2008
Author: karsten
Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9500
Modified Files:
README.patches gvim.desktop vim.spec
Added Files:
7.2.023 7.2.024 7.2.025
Log Message:
- patchlevel 25
- add Categories tag to desktop file (#226526)
- add requirement on hicolor-icon-theme to vim-X11 (#226526)
- drop Amiga info files (#226526)
- remove non-utf8 man pages (#226526)
--- NEW FILE 7.2.023 ---
To: vim-dev at vim.org
Subject: Patch 7.2.023
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.2.023
Problem: 'cursorcolumn' is in the wrong place in a closed fold when the
display is shifted left. (Gary Johnson)
Solution: Subtract w_skipcol or w_leftcol when needed.
Files: src/screen.c
*** ../vim-7.2.022/src/screen.c Thu Jul 24 20:29:09 2008
--- src/screen.c Fri Sep 26 21:23:06 2008
***************
*** 2439,2447 ****
#ifdef FEAT_SYN_HL
/* Show 'cursorcolumn' in the fold line. */
! if (wp->w_p_cuc && (int)wp->w_virtcol + txtcol < W_WIDTH(wp))
! ScreenAttrs[off + wp->w_virtcol + txtcol] = hl_combine_attr(
! ScreenAttrs[off + wp->w_virtcol + txtcol], hl_attr(HLF_CUC));
#endif
SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
--- 2439,2455 ----
#ifdef FEAT_SYN_HL
/* Show 'cursorcolumn' in the fold line. */
! if (wp->w_p_cuc)
! {
! txtcol += wp->w_virtcol;
! if (wp->w_p_wrap)
! txtcol -= wp->w_skipcol;
! else
! txtcol -= wp->w_leftcol;
! if (txtcol >= 0 && txtcol < W_WIDTH(wp))
! ScreenAttrs[off + txtcol] = hl_combine_attr(
! ScreenAttrs[off + txtcol], hl_attr(HLF_CUC));
! }
#endif
SCREEN_LINE(row + W_WINROW(wp), W_WINCOL(wp), (int)W_WIDTH(wp),
*** ../vim-7.2.022/src/version.c Sat Sep 20 16:26:10 2008
--- src/version.c Wed Oct 1 21:07:31 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 23,
/**/
--
hundred-and-one symptoms of being an internet addict:
124. You begin conversations with, "Who is your internet service provider?"
/// 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.2.024 ---
To: vim-dev at vim.org
Subject: Patch 7.2.024
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.2.024
Problem: It's possible to set 'history' to a negative value and that causes
an out-of-memory error.
Solution: Check that 'history' has a positive value. (Doug Kearns)
Files: src/option.c
*** ../vim-7.2.023/src/option.c Thu Jul 24 18:45:15 2008
--- src/option.c Fri Sep 26 22:20:20 2008
***************
*** 7974,7979 ****
--- 7974,7984 ----
else /* curwin->w_p_scr > curwin->w_height */
curwin->w_p_scr = curwin->w_height;
}
+ if (p_hi < 0)
+ {
+ errmsg = e_positive;
+ p_hi = 0;
+ }
if (p_report < 0)
{
errmsg = e_positive;
*** ../vim-7.2.023/src/version.c Wed Oct 1 21:09:02 2008
--- src/version.c Thu Oct 2 22:47:22 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 24,
/**/
--
hundred-and-one symptoms of being an internet addict:
127. You bring your laptop and cellular phone to church.
/// 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.2.025 ---
To: vim-dev at vim.org
Subject: Patch 7.2.025
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.2.025
Problem: When a CursorHold event invokes system() it is retriggered over
and over again.
Solution: Don't reset did_cursorhold when getting K_IGNORE.
Files: src/normal.c
*** ../vim-7.2.024/src/normal.c Sat Sep 6 16:44:06 2008
--- src/normal.c Sat Sep 27 13:03:34 2008
***************
*** 1132,1138 ****
out_flush();
#endif
#ifdef FEAT_AUTOCMD
! did_cursorhold = FALSE;
#endif
State = NORMAL;
--- 1132,1139 ----
out_flush();
#endif
#ifdef FEAT_AUTOCMD
! if (ca.cmdchar != K_IGNORE)
! did_cursorhold = FALSE;
#endif
State = NORMAL;
*** ../vim-7.2.024/src/version.c Thu Oct 2 22:48:01 2008
--- src/version.c Thu Oct 2 22:54:41 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 25,
/**/
--
hundred-and-one symptoms of being an internet addict:
128. You can access the Net -- via your portable and cellular phone.
/// 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/rpms/vim/devel/README.patches,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- README.patches 30 Sep 2008 13:06:23 -0000 1.112
+++ README.patches 20 Oct 2008 13:28:53 -0000 1.113
@@ -47,3 +47,6 @@
1521 7.2.020 "kvim" starts the GUI even though KDE is no longer supported
4806 7.2.021 getting full file name when executing autocmds may be slow
3823 7.2.022 (extra) cannot run tests with the MingW compiler
+ 2062 7.2.023 'cursorcolumn' wrong in a closed fold when display is shifted
+ 1452 7.2.024 'history' can be made negative, causes out-of-memory error
+ 1470 7.2.025 a CursorHold event that invokes system() is retriggered
Index: gvim.desktop
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/gvim.desktop,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gvim.desktop 7 Jan 2008 18:47:40 -0000 1.6
+++ gvim.desktop 20 Oct 2008 13:28:53 -0000 1.7
@@ -61,3 +61,4 @@
Terminal=0
X-XClassHintResName=VIM
MapNotify=false
+Categories=Utility;TextEditor;
Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- vim.spec 30 Sep 2008 13:06:23 -0000 1.221
+++ vim.spec 20 Oct 2008 13:28:53 -0000 1.222
@@ -18,7 +18,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
-%define patchlevel 022
+%define patchlevel 025
Summary: The VIM editor
URL: http://www.vim.org/
@@ -78,6 +78,9 @@
Patch020: 7.2.020
Patch021: 7.2.021
Patch022: 7.2.022
+Patch023: 7.2.023
+Patch024: 7.2.024
+Patch025: 7.2.025
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@@ -179,6 +182,7 @@
Provides: gvim = %{version}-%{release}
BuildRequires: gtk2-devel libSM-devel libXt-devel libXpm-devel
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: hicolor-icon-theme
%description X11
VIM (VIsual editor iMproved) is an updated and improved version of the
@@ -232,6 +236,9 @@
%patch020 -p0
%patch021 -p0
%patch022 -p0
+%patch023 -p0
+%patch024 -p0
+%patch025 -p0
# install spell files
%if %{withvimspell}
@@ -338,6 +345,8 @@
cp -f %{SOURCE11} .
cp -f %{SOURCE14} $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/template.spec
cp runtime/doc/uganda.txt LICENSE
+# Those aren't Linux info files but some binary files for Amiga:
+rm -f README*.info
cd src
@@ -372,14 +381,11 @@
rm -f .%{_mandir}/man1/rvim.1
ln -sf vim.1.gz .%{_mandir}/man1/vi.1.gz
ln -sf vim.1.gz .%{_mandir}/man1/rvi.1.gz
- ln -sf vim.1.gz .%{_mandir}/man1/rvim.1.gz
ln -sf vim.1.gz .%{_mandir}/man1/vimdiff.1.gz
ln -sf gvim ./%{_bindir}/gview
ln -sf gvim ./%{_bindir}/gex
ln -sf gvim ./%{_bindir}/evim
ln -sf gvim ./%{_bindir}/gvimdiff
- ln -sf vim.1.gz .%{_mandir}/man1/gvim.1.gz
- ln -sf vim.1.gz .%{_mandir}/man1/gvimdiff.1.gz
ln -sf gvim ./%{_bindir}/vimx
%if "%{desktop_file}" == "1"
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
@@ -468,6 +474,23 @@
done
)
+# Remove not UTF-8 manpages
+for i in pl.ISO8859-2 it.ISO8859-1 ru.KOI8-R fr.ISO8859-1; do
+ rm -rf $RPM_BUILD_ROOT/%{_mandir}/$i
+done
+
+# use common man1/ru directory
+mv $RPM_BUILD_ROOT/%{_mandir}/ru.UTF-8 $RPM_BUILD_ROOT/%{_mandir}/ru
+
+# Remove duplicate man pages
+for i in fr.UTF-8 it.UTF-8 pl.UTF-8; do
+ rm -rf $RPM_BUILD_ROOT/%{_mandir}/$i
+done
+
+for i in rvim gvim.1 gvimdiff.1; do
+ echo ".so man1/vim.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/$i
+done
+
%post X11
touch --no-create %{_datadir}/icons/hicolor
if [ -x /%{_bindir}/gtk-update-icon-cache ]; then
@@ -483,7 +506,7 @@
update-desktop-database &> /dev/null ||:
%clean
-rm -rf $RPM_BUILD_ROOT
+#rm -rf $RPM_BUILD_ROOT
%files common
%defattr(-,root,root)
@@ -548,10 +571,10 @@
%{_mandir}/man1/rvi.*
%{_mandir}/man1/rview.*
%{_mandir}/man1/xxd.*
-%lang(fr) %{_mandir}/fr*/*/*
-%lang(it) %{_mandir}/it*/*/*
-%lang(ru) %{_mandir}/ru*/*/*
-%lang(pl) %{_mandir}/pl*/*/*
+%lang(fr) %{_mandir}/fr/man1/*
+%lang(it) %{_mandir}/it/man1/*
+%lang(pl) %{_mandir}/pl/man1/*
+%lang(ru) %{_mandir}/ru/man1/*
%if %{withvimspell}
%files spell
@@ -650,6 +673,13 @@
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Mon Oct 20 2008 Karsten Hopp <karsten at redhat.com> 7.2.025-1
+- patchlevel 25
+- add Categories tag to desktop file (#226526)
+- add requirement on hicolor-icon-theme to vim-X11 (#226526)
+- drop Amiga info files (#226526)
+- remove non-utf8 man pages (#226526)
+
* Tue Sep 30 2008 Karsten Hopp <karsten at redhat.com> 7.2.022-1
- patchlevel 22
More information about the scm-commits
mailing list