rpms/vim
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- patchlevel 26

Browse Source 
- own some directories in /usr/share/vim/vimfiles (#469491)
This commit is contained in:
Karsten Hopp 2008-11-03 11:44:50 +00:00
parent 66305f9fe2
commit 1a1ca1a742
3 changed files with 123 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
7.2.026 Normal file
View File

@ -0,0 +1,105 @@
To: vim-dev@vim.org
Subject: Patch 7.2.026
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.026 (after 7.2.010)
Problem: "K" doesn't use the length of the identifier but uses the rest of
the line.
Solution: Copy the desired number of characters first.
Files: src/normal.c
*** ../vim-7.2.025/src/normal.c Thu Oct 2 22:55:17 2008
--- src/normal.c Sat Nov 1 13:41:03 2008
***************
*** 183,188 ****
--- 183,190 ----
static void nv_cursorhold __ARGS((cmdarg_T *cap));
#endif
+ static char *e_noident = N_("E349: No identifier under cursor");
+
/*
* Function to be called for a Normal or Visual mode command.
* The argument is a cmdarg_T.
***************
*** 3510,3516 ****
if (find_type & FIND_STRING)
EMSG(_("E348: No string under cursor"));
else
! EMSG(_("E349: No identifier under cursor"));
return 0;
}
ptr += col;
--- 3512,3518 ----
if (find_type & FIND_STRING)
EMSG(_("E348: No string under cursor"));
else
! EMSG(_(e_noident));
return 0;
}
ptr += col;
***************
*** 5472,5479 ****
{
/* An external command will probably use an argument starting
* with "-" as an option. To avoid trouble we skip the "-". */
! while (*ptr == '-')
++ptr;
/* When a count is given, turn it into a range. Is this
* really what we want? */
--- 5474,5490 ----
{
/* An external command will probably use an argument starting
* with "-" as an option. To avoid trouble we skip the "-". */
! while (*ptr == '-' && n > 0)
! {
++ptr;
+ --n;
+ }
+ if (n == 0)
+ {
+ EMSG(_(e_noident)); /* found dashes only */
+ vim_free(buf);
+ return;
+ }
/* When a count is given, turn it into a range. Is this
* really what we want? */
***************
*** 5520,5526 ****
--- 5531,5539 ----
if (cmdchar == 'K' && !kp_help)
{
/* Escape the argument properly for a shell command */
+ ptr = vim_strnsave(ptr, n);
p = vim_strsave_shellescape(ptr, TRUE);
+ vim_free(ptr);
if (p == NULL)
{
vim_free(buf);
*** ../vim-7.2.025/src/version.c Thu Oct 2 22:55:17 2008
--- src/version.c Sat Nov 1 13:50:53 2008
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 26,
/**/
--
hundred-and-one symptoms of being an internet addict:
161. You get up before the sun rises to check your e-mail, and you
find yourself in the very same chair long after the sun has set.
/// 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 ///

1
README.patches
View File

@ -50,3 +50,4 @@ Individual patches for Vim 7.2:
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
2969 7.2.026 (after 7.2.010) 'K' uses the rest of the line

20
vim.spec
View File

@ -18,13 +18,13 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
%define patchlevel 025
%define patchlevel 026
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
@ -81,6 +81,7 @@ Patch022: 7.2.022
Patch023: 7.2.023
Patch024: 7.2.024
Patch025: 7.2.025
Patch026: 7.2.026
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@ -239,6 +240,7 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch023 -p0
%patch024 -p0
%patch025 -p0
%patch026 -p0
# install spell files
%if %{withvimspell}
@ -341,7 +343,7 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/bin
mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/{after/syntax,colors,doc,ftdetect,ftplugin,indent,plugin,syntax}
cp -f %{SOURCE11} .
cp -f %{SOURCE14} $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/template.spec
cp runtime/doc/uganda.txt LICENSE
@ -518,6 +520,14 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/%{name}/%{vimdir}
%dir %{_datadir}/%{name}/vimfiles
%dir %{_datadir}/%{name}/vimfiles/after
%dir %{_datadir}/%{name}/vimfiles/after/syntax
%dir %{_datadir}/%{name}/vimfiles/colors
%dir %{_datadir}/%{name}/vimfiles/doc
%dir %{_datadir}/%{name}/vimfiles/ftdetect
%dir %{_datadir}/%{name}/vimfiles/ftplugin
%dir %{_datadir}/%{name}/vimfiles/indent
%dir %{_datadir}/%{name}/vimfiles/plugin
%dir %{_datadir}/%{name}/vimfiles/syntax
%{_datadir}/%{name}/vimfiles/template.spec
%{_datadir}/%{name}/%{vimdir}/autoload
%{_datadir}/%{name}/%{vimdir}/colors
@ -673,6 +683,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
* Mon Nov 03 2008 Karsten Hopp <karsten@redhat.com> 7.2.026-1
- patchlevel 26
- own some directories in /usr/share/vim/vimfiles (#469491)
* Tue Oct 21 2008 Karsten Hopp <karsten@redhat.com> 7.2.025-2
- re-enable clean