packages: vim/vim-vimrc.patch, vim/vim.spec, vim/vim-gzhelp.patch (REMOVED)...

[glen]

Author: glen                         Date: Sun Jan  2 20:57:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge -gzhelp.patch into -vimrc.patch

---- Files affected:
packages/vim:
   vim-vimrc.patch (1.10 -> 1.11) , vim.spec (1.537 -> 1.538) , vim-gzhelp.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/vim/vim-vimrc.patch
diff -u packages/vim/vim-vimrc.patch:1.10 packages/vim/vim-vimrc.patch:1.11
--- packages/vim/vim-vimrc.patch:1.10	Thu May 14 01:36:02 2009
+++ packages/vim/vim-vimrc.patch	Sun Jan  2 21:57:40 2011
@@ -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

================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.537 packages/vim/vim.spec:1.538
--- packages/vim/vim.spec:1.537	Mon Dec 27 15:48:13 2010
+++ packages/vim/vim.spec	Sun Jan  2 21:57:40 2011
@@ -107,7 +107,6 @@
 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
@@ -719,7 +718,6 @@
 %patch108 -p1
 %patch109 -p1
 %patch110 -p1
-%patch111 -p1
 %patch112 -p1
 %patch113 -p1
 %patch114 -p1
@@ -1380,6 +1378,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.538  2011/01/02 20:57:40  glen
+- merge -gzhelp.patch into -vimrc.patch
+
 Revision 1.537  2010/12/27 14:48:13  glen
 - 7.3.089
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim-vimrc.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.537&r2=1.538&f=u