- update to 7.2.148

Changed files:
    vim-relativenumber.patch -> 1.3
    vim.spec -> 1.463

diff --git a/vim-relativenumber.patch b/vim-relativenumber.patch
index d8907cfcb0273144b33fabb3bfeeac2475d2f3eb..856e8b7580167ba05cd007feffa0a0b60c2fbd19 100644 (file)
--- a/vim-relativenumber.patch
+++ b/vim-relativenumber.patch
@@ -903,21 +903,21 @@ Index: src/screen.c
                            for (p_extra = extra; *p_extra == ' '; ++p_extra)
                                *p_extra = '-';
 ***************
-*** 4651,4657 ****
+*** 4696,4702 ****
        else
            --n_skip;
   
 !      /* Only advance the "vcol" when after the 'number' column. */
-       if (draw_state >= WL_SBR
+       if (draw_state > WL_NR
   #ifdef FEAT_DIFF
                && filler_todo <= 0
---- 4674,4681 ----
+--- 4696,4703 ----
        else
            --n_skip;
   
 !      /* Only advance the "vcol" when after the 'number' or 'relativenumber'
 !       * column. */
-       if (draw_state >= WL_SBR
+       if (draw_state > WL_NR
   #ifdef FEAT_DIFF
                && filler_todo <= 0
 ***************

diff --git a/vim.spec b/vim.spec
index 81b4b4c6916584cb71351ee410f2da1367335a01..ca1505662f3d7d0d9c0a394896f14a3b2e7b82ba 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -17,7 +17,7 @@
 %bcond_without home_etc        # without home_etc support
 #
 %define                ver             7.2
-%define                patchlevel      128
+%define                patchlevel      148
 
 # cflags get changed while configuring
 %undefine      configure_cache
@@ -102,6 +102,7 @@ Patch106:   %{name}-ft-cron.patch
 Patch107:      %{name}-relativenumber.patch
 Patch108:      %{name}-phpscript.patch
 Patch109:      %{name}-pam.patch
+Patch110:      %{name}-ft-bash.patch
 URL:           http://www.vim.org/
 BuildRequires: acl-devel
 BuildRequires: autoconf
@@ -677,6 +678,7 @@ jak również GUI GTK+2.
 %patch107 -p0
 %patch108 -p1
 %patch109 -p1
+%patch110 -p1
 
 install %{SOURCE20} runtime/syntax
 install %{SOURCE21} runtime/syntax