- merge -gzhelp.patch into -vimrc.patch

Changed files:
    vim-gzhelp.patch -> 1.2
    vim-vimrc.patch -> 1.11
    vim.spec -> 1.538

diff --git a/vim-gzhelp.patch b/vim-gzhelp.patch
deleted file mode 100644 (file)
index d017edf..0000000
--- a/vim-gzhelp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- vim72/runtime/vimrc_example.vim~   2009-02-11 07:45:02.000000000 +0200
-+++ vim72/runtime/vimrc_example.vim    2009-04-15 00:21:38.039540629 +0300
-@@ -31,6 +31,9 @@
- set showcmd           " display incomplete commands
- set incsearch         " do incremental searching
- 
-+" use compressed docs, see :help gzip-helpfile
-+set helpfile=$VIMRUNTIME/doc/help.txt.gz
-+
- " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
- " let &guioptions = substitute(&guioptions, "t", "", "g")
- 

diff --git a/vim-vimrc.patch b/vim-vimrc.patch
index 430a46ef243b215270770d5e8edefcdd3a583c34..c9068bec9b1706ced8bb49a2b550010e131bb910 100644 (file)
--- a/vim-vimrc.patch
+++ b/vim-vimrc.patch
@@ -1,6 +1,16 @@
---- vim72/runtime/vimrc_example.vim    2008-08-18 13:33:06.007243535 +0300
-+++ vim72/runtime/vimrc_example.vim    2009-05-14 02:04:43.261671071 +0300
-@@ -42,13 +42,13 @@
+--- vim73/runtime/vimrc_example.vim~   2010-05-15 14:03:57.000000000 +0300
++++ vim73/runtime/vimrc_example.vim    2011-01-02 22:53:43.246560000 +0200
+@@ -31,6 +31,9 @@
+ set showcmd           " display incomplete commands
+ set incsearch         " do incremental searching
+ 
++" use compressed docs, see :help gzip-helpfile
++set helpfile=$VIMRUNTIME/doc/help.txt.gz
++
+ " For Win32 GUI: remove 't' flag from 'guioptions': no tearoff menu entries
+ " let &guioptions = substitute(&guioptions, "t", "", "g")
+ 
+@@ -42,13 +45,13 @@
  inoremap <C-U> <C-G>u<C-U>
  
  " In many terminal emulators the mouse works just fine, thus enable it.
@@ -18,7 +28,10 @@
    syntax on
    set hlsearch
  endif
-@@ -93,4 +93,7 @@
+@@ -90,7 +93,10 @@
+ " Convenient command to see the difference between the current buffer and the
+ " file it was loaded from, thus the changes you made.
+ " Only define it when not defined already.
 -if !exists(":DiffOrig")
 +if v:progname =~! "vi" && !exists(":DiffOrig")
    command DiffOrig vert new | set bt=nofile | r # | 0d_ | diffthis

diff --git a/vim.spec b/vim.spec
index 0e695267cddda69dedec8b81af1d9caaf939442a..19d7b2261d76f661171be8aff57d35e718b324a7 100644 (file)
--- a/vim.spec
+++ b/vim.spec
@@ -106,7 +106,6 @@ Patch106:   %{name}-ft-cron.patch
 Patch108:      %{name}-phpscript.patch
 Patch109:      %{name}-pam.patch
 Patch110:      %{name}-ft-bash.patch
-Patch111:      %{name}-gzhelp.patch
 Patch112:      %{name}-localedir.patch
 Patch113:      %{name}-locales.patch
 Patch114:      %{name}-rtdir.patch
@@ -718,7 +717,6 @@ jak również GUI GTK+2.
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
-%patch111 -p1
 %patch112 -p1
 %patch113 -p1
 %patch114 -p1