rpm/vim
SHA256
1
0
Fork 0
forked from pool/vim
Code Pull Requests Activity

Accepting request 53640 from home:Freespacer:branches:editors

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/53640
OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=27
This commit is contained in:
Cristian Rodríguez 2010-11-22 12:28:22 +00:00 committed by Git OBS Bridge
parent bd1f6bb600
commit c870667e66
37 changed files with 393 additions and 581 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
ANNOUNCEMENT.vim-7.2
View File

@ -1,148 +0,0 @@
Subject: Vim version 7.2 released!
From: Bram Moolenaar <Bram@moolenaar.net>
Date: Sat, 09 Aug 2008 20:18:37 +0200
Hello Vim users,
Announcing: Vim (Vi IMproved) version 7.2
This is a minor release of Vim. In the 15 months since Vim 7.1 many
bugs were fixed and runtime files have been added and updated. There
are also security improvements, therefore it's a good idea to upgrade.
The main new feature since 7.1 is floating point support. You can use
it in the Vim script language to add up a list of amounts, for example.
Once you have installed Vim 7.2 you can find details about the changes
since Vim 7.1 with ":help version-7.2".
Notes
-----
The new O'Reilly book "Learning the Vi and Vim editors" is now
available. See http://iccf-holland.org/click5.html
I will not make an Amiga or OS/2 binary for Vim 7.2. A Mac version is
hopefully available soon on http://macvim.org/ and/or from the MacVim
project at http://code.google.com/p/macvim/
A Win64 binary should be available soon at
http://code.google.com/p/vim-win3264/
There is no 16-bit DOS version, the executable is too big to fit in the
limited memory space.
Gratitude
---------
If you like Vim, this is the way to say thanks:
http://iccf-holland.org/clinic.html
Where to get it
---------------
All files can be found below this directory:
ftp://ftp.vim.org/pub/vim/
Information about which files to download for what system:
http://www.vim.org/download.php
A list of mirror sites can be found here:
http://www.vim.org/mirrors.php
Vim 7.2 is also available from CVS. Subversion will follow later.
http://www.vim.org/cvs.php
http://www.vim.org/subversion.php
The Aap files have also been updated, see http://www.a-a-p.org/ports.html
An overview of the files:
UNIX:
unix/vim-7.2.tar.bz2 sources + runtime files, bzip2 compressed
MS-WINDOWS one-size-fits-all:
pc/gvim72.exe self-installing, includes all runtime files
VARIOUS:
extra/vim-7.2-extra.tar.gz source files for non-Unix platforms
extra/vim-7.2-lang.tar.gz multi-language files
doc/vim72html.zip help files converted to HTML
MS-WINDOWS separate files:
pc/vim72rt.zip runtime files
pc/vim72lang.zip files for translated messages and menus
pc/gvim72.zip GUI binary for Windows 95/98/NT/2000/XP
pc/gvim72ole.zip GUI binary with OLE support
pc/gvim72_s.zip GUI binary for Windows 3.1 (untested)
pc/vim72d32.zip console version for MS-DOS/Windows 95/98
pc/vim72w32.zip console version for Windows NT/2000/XP
pc/vim72src.zip sources for PC (with CR-LF)
DIFFS TO PREVIOUS RELEASE:
unix/vim-7.1-7.2.diff.gz sources + runtime files
extra/vim-7.1-7.2-extra.diff.gz extra files
extra/vim-7.1-7.2-lang.diff.gz multi-language files
DIFFS TO PREVIOUS BETA RELEASE
unstable/unix/vim-7.2c-7.2.diff.gz sources + runtime files
unstable/extra/vim-7.2c-7.2-extra.diff.gz extra files
unstable/extra/vim-7.2c-7.2-lang.diff.gz multi-language files
Mailing lists
-------------
For user questions you can turn to the Vim mailing list. There are a
lot of tips, scripts and solutions. You can ask your Vim questions, but
only if you subscribe. See http://www.vim.org/maillist.php#vim
If you want to help Vim development, discuss new features or get the
latest patches, subscribe to the vim-dev mailing list. See
http://www.vim.org/maillist.php#vim-dev
Subject specific lists:
Multi-byte issues: http://www.vim.org/maillist.php#vim-multibyte
Macintosh issues: http://www.vim.org/maillist.php#vim-mac
Before you ask a question you should search the archives, someone may
already have given the answer.
Reporting bugs
--------------
Send them to <bugs@vim.org>. Please describe the problem precisely.
All the time spent on answering mail is subtracted from the time that is
spent on improving Vim! Always give a reproducible example and try to
find out which settings or other things influence the appearance of the
bug. Try starting without your own vimrc file: "vim -u NONE". Try
different machines if possible. See ":help bugs" in Vim. Send me a
patch if you can!
If something needs discussing with other developers, send a message to the
vim-dev mailing list. You need to subscribe first.
Happy Vimming!
--
"Software is like sex... it's better when it's free."
-- Linus Torvalds, initiator of the free Linux OS
Makes me wonder what FSF stands for...?
/// 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 ///
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---


126
ANNOUNCEMENT.vim-7.3 Normal file
View File

@ -0,0 +1,126 @@
Subject: Vim version 7.3 released!
From: Bram Moolenaar <Bram@moolenaar.net>
Date: Sun, 15 Aug 2010 21:52:04 +0200
Hello Vim users,
Announcing: Vim (Vi IMproved) version 7.3
This is a minor release of Vim. It consists of Vim 7.2 plus all
patches, updated runtime files and some more, see below. It has been
two years since the 7.2 release, thus it's not that "minor". But not
"major" either. Something in between, don't know how to call that.
The most notable additions since 7.2:
- Persistent undo and undo for reload
- Blowfish encryption, encryption of the swap file
- Conceal text
- Lua interface
- Python 3 interface
Once you have installed Vim 7.3 you can find all the details about the
changes since Vim 7.2 with:
:help version-7.3
Gratitude
---------
If you like Vim, this is the way to say thanks:
http://iccf-holland.org/clinic.html
Where to get it
---------------
The best way to obtain the latest Vim 7.3 is using Mercurial.
Summary:
hg clone https://vim.googlecode.com/hg/ vim
cd vim/src
hg update vim73
make
More information here: http://www.vim.org/mercurial.php
All downloadable files can be found below this directory:
ftp://ftp.vim.org/pub/vim/
Direct link to the MS-Windows self-installing executable:
ftp://ftp.vim.org/pub/vim/pc/gvim73.exe
Information about which files to download for what system:
http://www.vim.org/download.php
A list of mirror sites can be found here:
http://www.vim.org/mirrors.php
UNIX:
unix/vim-7.3.tar.bz2 sources + runtime files, bzip2 compressed
MS-WINDOWS one-size-fits-all:
pc/gvim73.exe installer for GUI and console executables,
includes all runtime files, many features
VARIOUS:
doc/vim73html.zip help files converted to HTML
MS-WINDOWS separate files:
pc/vim73rt.zip runtime files
pc/gvim73.zip GUI binary for Windows 95/98/NT/2000/XP
pc/gvim73ole.zip GUI binary with OLE support
pc/gvim73_s.zip GUI binary for Windows 3.1 (untested)
pc/vim73d32.zip console version for MS-DOS/Windows 95/98
pc/vim73w32.zip console version for Windows NT/2000/XP
pc/vim73src.zip sources for PC (with CR-LF)
DIFFS TO PREVIOUS RELEASE:
unix/vim-7.2-7.3.diff.gz sources + runtime files
unstable/unix/vim-7.3f-7.3.diff.gz sources + runtime files
Omitted in this version are:
- Extra and lang archives, these are now included in the main source
and runtime archives.
- The 16-bit DOS, OS/2 and Amiga versions, these are obsolete.
Mailing lists
-------------
For user questions you can turn to the Vim mailing list. There are a
lot of tips, scripts and solutions. You can ask your Vim questions, but
only if you subscribe. See http://www.vim.org/maillist.php#vim
If you want to help Vim development, discuss new features or get the
latest patches, subscribe to the vim-dev mailing list. See
http://www.vim.org/maillist.php#vim-dev
Subject specific lists:
Multi-byte issues: http://www.vim.org/maillist.php#vim-multibyte
Macintosh issues: http://www.vim.org/maillist.php#vim-mac
Before you ask a question you should search the archives, someone may
already have given the answer.
Reporting bugs
--------------
Send them to <vim-...@vim.org>. Please describe the problem precisely.
All the time spent on answering mail is subtracted from the time that is
spent on improving Vim! Always give a reproducible example and try to
find out which settings or other things influence the appearance of the
bug. Try starting without your own vimrc file: "vim -u NONE". Try
different machines if possible. See ":help bugs" in Vim. Send me a
patch if you can!
Happy Vimming!
--
Q: Should I clean my house or work on Vim?
A: Whatever contains more bugs.
/// Bram Moolenaar -- B...@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 ///
--~--~---------~--~----~------------~-------~--~----~
You received this message from the "vim_dev" maillist.
For more information, visit http://www.vim.org/maillist.php
-~----------~----~----~----~------~----~------~--~---


11
vim-7.0-flex-array.diff
View File

@ -1,11 +0,0 @@
--- src/structs.h.sav 2007-02-02 11:31:05.000000000 +0100
+++ src/structs.h 2007-02-02 11:31:14.000000000 +0100
@@ -1082,7 +1082,7 @@
{
typval_T di_tv; /* type and value of the variable */
char_u di_flags; /* flags (only used for variable) */
- char_u di_key[1]; /* key (actually longer!) */
+ char_u di_key[]; /* key (actually longer!) */
};
typedef struct dictitem_S dictitem_T;

12
vim-7.0-help_tags.patch
View File

@ -1,12 +0,0 @@
Index: vim71/runtime/doc/Makefile
===================================================================
--- vim71.orig/runtime/doc/Makefile
+++ vim71/runtime/doc/Makefile
@@ -301,6 +301,7 @@ all: tags vim.man vimdiff.man vimtutor.m
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
+ export VIMRUNTIME=../; \
$(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit
# Use "doctags" to generate the tags file. Only works for English!

31
vim-7.0-no_nb.patch
View File

@ -1,31 +0,0 @@
Index: vim72/src/po/Makefile
===================================================================
--- vim72.orig/src/po/Makefile
+++ vim72/src/po/Makefile
@@ -18,7 +18,7 @@ LANGUAGES = \
it \
ja \
ko \
- no \
+ nb \
pl \
pt_BR \
ru \
@@ -45,7 +45,7 @@ MOFILES = \
it.mo \
ja.mo \
ko.mo \
- no.mo \
+ nb.mo \
pl.mo \
pt_BR.mo \
ru.mo \
@@ -82,7 +82,7 @@ CHECKFILES = \
it.ck \
ja.ck \
ko.ck \
- no.ck \
+ nb.ck \
pl.ck \
pt_BR.ck \
ru.ck \

11
vim-7.0-ruby_ldflags_configure.patch
View File

@ -1,11 +0,0 @@
--- vim70/src/auto/configure.orig 2006-05-04 12:46:19.000000000 +0200
+++ vim70/src/auto/configure 2006-08-09 14:45:46.000000000 +0200
@@ -4784,7 +4784,7 @@
if test "X$librubyarg" != "X"; then
RUBY_LIBS="$librubyarg $RUBY_LIBS"
fi
- rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+ rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]' | sed 's/\\\\,/,/g'`
if test "X$rubyldflags" != "X"; then
LDFLAGS="$rubyldflags $LDFLAGS"
fi

8
vim-7.0-use_awk.patch
View File

@ -1,8 +0,0 @@
--- vim70/runtime/tools/mve.awk.orig 2004-06-07 16:32:33.000000000 +0200
+++ vim70/runtime/tools/mve.awk 2006-07-11 16:28:08.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/nawk -f
+#!/usr/bin/awk -f
#
# Change "nawk" to "awk" or "gawk" if you get errors.
#

24
vim-7.1-remove-terrible-hack.patch
View File

@ -1,24 +0,0 @@
Index: src/gui_gtk.c
===================================================================
--- src/gui_gtk.c.orig
+++ src/gui_gtk.c
@@ -2320,19 +2320,6 @@ gui_mch_dialog(int type, /* type of
gtk_widget_destroy(dialog);
}
- /* Terrible hack: When the text area still has focus when we remove the
- * dialog, somehow gvim loses window focus. This is with "point to type"
- * in the KDE 3.1 window manager. Warp the mouse pointer to outside the
- * window and back to avoid that. */
- if (!gui.in_focus)
- {
- int x, y;
-
- gdk_window_get_pointer(gui.drawarea->window, &x, &y, NULL);
- gui_mch_setmouse(-100, -100);
- gui_mch_setmouse(x, y);
- }
-
return response > 0 ? response : 0;
}

4
vim-7.1-rpmlintrc
View File

@ -1,4 +0,0 @@
addFilter("vim-data devel-file-in-non-devel-package")
addFilter("vim-data file-not-in-%lang")
addFilter("vim-base package-with-huge-docs")

3
vim-7.2-extra.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1773cdb76d66e291afd4e9f7b6bb38eca730d90d7ceeda659649b71169f0b996
size 649002

3
vim-7.2-lang.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:425bd5eb0cf142a44d19faf7a6501fbdf992a245d8a640a23629b6372d9a57ca
size 725317

22
vim-7.2-lib64.patch
View File

@ -1,22 +0,0 @@
--- src/configure.in
+++ src/configure.in 2009-02-25 16:42:39.840201362 +0100
@@ -659,7 +659,7 @@ if test "$enable_pythoninterp" = "yes";
[
vi_cv_path_python_conf=
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
- for subdir in lib share; do
+ for subdir in lib64 lib share; do
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python_conf="$d"
--- src/auto/configure
+++ src/auto/configure 2009-02-25 16:42:24.320701679 +0100
@@ -5091,7 +5091,7 @@ else
vi_cv_path_python_conf=
for path in "${vi_cv_path_python_pfx}" "${vi_cv_path_python_epfx}"; do
- for subdir in lib share; do
+ for subdir in lib64 lib share; do
d="${path}/${subdir}/python${vi_cv_var_python_version}/config"
if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python_conf="$d"

3
vim-7.2-patches.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cddca138dfc10dae0ba69cd1ae99ac975e5ad8f50e4a7812cc000c5cc74ef485
size 109150

92
vim-7.2-php.patch
View File

@ -1,92 +0,0 @@
--- runtime/indent/php.vim
+++ runtime/indent/php.vim 2009-02-25 16:18:00.411965000 +0100
@@ -2,9 +2,9 @@
" Language: PHP
" Author: John Wellesz <John.wellesz (AT) teaser (DOT) fr>
" URL: http://www.2072productions.com/vim/indent/php.vim
-" Last Change: 2008 June 7th
+" Last Change: 2008 November 22nd
" Newsletter: http://www.2072productions.com/?to=php-indent-for-vim-newsletter.php
-" Version: 1.28
+" Version: 1.30
"
" If you find a bug, please e-mail me at John.wellesz (AT) teaser (DOT) fr
" with an example of code that breaks the algorithm.
@@ -24,7 +24,7 @@
" NOTE: This script must be used with PHP syntax ON and with the php syntax
" script by Lutz Eymers (http://www.isp.de/data/php.vim ) or with the
" script by Peter Hodge (http://www.vim.org/scripts/script.php?script_id=1571 )
-" the later is bunbdled by default with vim 7.
+" the later is bunbdled by default with Vim 7.
"
"
" In the case you have syntax errors in your script such as HereDoc end
@@ -75,7 +75,7 @@
" some optimizations won't be available.
"
" Options: PHP_vintage_case_default_indent = 1 (defaults to 0) to add a meaningless indent
-" befaore 'case:' and 'default":' statement in switch block
+" befaore 'case:' and 'default":' statement in switch blocks.
"
if exists("b:did_indent")
@@ -145,6 +145,7 @@ if &fileformat == "unix" && exists("PHP_
endif
if exists("*GetPhpIndent")
+ call ResetPhpOptions()
finish " XXX
endif
@@ -317,14 +318,13 @@ endfunction " }}}
let s:notPhpHereDoc = '\%(break\|return\|continue\|exit\|else\)'
let s:blockstart = '\%(\%(\%(}\s*\)\=else\%(\s\+\)\=\)\=if\>\|else\>\|while\>\|switch\>\|for\%(each\)\=\>\|declare\>\|class\>\|interface\>\|abstract\>\|try\>\|catch\>\)'
-let s:autorestoptions = 0
-if ! s:autorestoptions
- au BufWinEnter,Syntax *.php,*.php3,*.php4,*.php5 call ResetOptions()
- let s:autorestoptions = 1
+let s:autoresetoptions = 0
+if ! s:autoresetoptions
+ let s:autoresetoptions = 1
endif
-function! ResetOptions()
- if ! b:optionsset
+function! ResetPhpOptions()
+ if ! b:optionsset && &filetype == "php"
if b:PHP_autoformatcomment
setlocal comments=s1:/*,mb:*,ex:*/,://,:#
@@ -341,6 +341,8 @@ function! ResetOptions()
endif
endfunc
+call ResetPhpOptions()
+
function! GetPhpIndent()
let b:GetLastRealCodeLNum_ADD = 0
@@ -360,7 +362,7 @@ function! GetPhpIndent()
if !b:PHP_indentinghuge && b:PHP_lastindented > b:PHP_indentbeforelast
if b:PHP_indentbeforelast
let b:PHP_indentinghuge = 1
- echom 'Large indenting detected, speed optimizations engaged (v1.28)'
+ echom 'Large indenting detected, speed optimizations engaged (v1.30 BETA 1)'
endif
let b:PHP_indentbeforelast = b:PHP_lastindented
endif
@@ -715,11 +717,11 @@ function! GetPhpIndent()
elseif last_line =~ '^\s*'.s:blockstart
let ind = ind + &sw
- elseif last_line =~# defaultORcase
+ elseif last_line =~# defaultORcase && cline !~# defaultORcase
let ind = ind + &sw
- elseif pline =~ '\%(;\%(\s*?>\)\=\|<<<''\=\a\w*''\=$\|^\s*}\|{\)'.endline . '\|' . defaultORcase
+ elseif pline =~ '\%(;\%(\s*?>\)\=\|<<<''\=\a\w*''\=$\|^\s*}\|{\)'.endline . '\|' . defaultORcase && cline !~# defaultORcase
let ind = ind + &sw
endif

61
vim-7.2.257.patch
View File

@ -1,61 +0,0 @@
To: vim-dev@vim.org
Subject: Patch 7.2.257
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 7.2.257
Problem: With GTK 2.17 lots of assertion error messages.
Solution: Remove check for static gravity. (Sebastian Droege)
Files: src/gui_gtk_f.c
*** ../vim-7.2.256/src/gui_gtk_f.c 2009-05-17 23:25:16.000000000 +0200
--- src/gui_gtk_f.c 2009-09-11 15:15:41.000000000 +0200
***************
*** 860,870 ****
gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
{
#ifdef HAVE_GTK2
! gboolean static_gravity_supported;
!
! static_gravity_supported = gdk_window_set_static_gravities(window,
! use_static);
! g_return_if_fail(static_gravity_supported);
#else
XSetWindowAttributes xattributes;
--- 860,868 ----
gtk_form_set_static_gravity(GdkWindow *window, gboolean use_static)
{
#ifdef HAVE_GTK2
! /* We don't check if static gravity is actually supported, because it
! * results in an annoying assertion error message. */
! gdk_window_set_static_gravities(window, use_static);
#else
XSetWindowAttributes xattributes;
*** ../vim-7.2.256/src/version.c 2009-09-11 15:46:20.000000000 +0200
--- src/version.c 2009-09-11 16:16:52.000000000 +0200
***************
*** 678,679 ****
--- 678,681 ----
{ /* Add new patch number below this line */
+ /**/
+ 257,
/**/
--
hundred-and-one symptoms of being an internet addict:
231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
in the front doorway permanently so it always looks like you are
actually attempting to do something about that mess that has amassed
since you discovered the Internet.
/// 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 ///

3
vim-7.2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3546216b7a741229be363a82e40702962bea362a0faaacbe6cd4d2ca1c6dde1c
size 7203720

31
vim-7.2-diff_check.patch → vim-7.3-diff_check.patch
View File

@ -1,5 +1,6 @@
--- vim72/src/diff.c
+++ vim72/src/diff.c 2009-02-16 17:11:33.224201744 +0100
diff -rup vim73.orig/src/diff.c vim73/src/diff.c
--- vim73.orig/src/diff.c 2010-07-31 15:35:21.000000000 +0200
+++ vim73/src/diff.c 2010-11-21 06:17:00.897968023 +0100
@@ -42,7 +42,7 @@ static void diff_check_unchanged __ARGS(
static int diff_check_sanity __ARGS((tabpage_T *tp, diff_T *dp));
static void diff_redraw __ARGS((int dofold));
@ -9,7 +10,7 @@
static int diff_equal_entry __ARGS((diff_T *dp, int idx1, int idx2));
static int diff_cmp __ARGS((char_u *s1, char_u *s2));
#ifdef FEAT_FOLDING
@@ -665,6 +665,7 @@ ex_diffupdate(eap)
@@ -664,6 +664,7 @@ ex_diffupdate(eap)
char_u *tmp_diff;
FILE *fd;
int ok;
@ -17,7 +18,7 @@
int io_error = FALSE;
/* Delete all diffblocks. */
@@ -717,7 +718,7 @@ ex_diffupdate(eap)
@@ -716,7 +717,7 @@ ex_diffupdate(eap)
if (fwrite("line2\n", (size_t)6, (size_t)1, fd) != 1)
io_error = TRUE;
fclose(fd);
@ -26,20 +27,20 @@
fd = mch_fopen((char *)tmp_diff, "r");
if (fd == NULL)
io_error = TRUE;
@@ -763,6 +764,12 @@ ex_diffupdate(eap)
@@ -762,6 +763,12 @@ ex_diffupdate(eap)
}
#endif
+ /* diff returned an error */
+ if (retval == 2) {
+ ok = FALSE;
+ break;
+ ok = FALSE;
+ break;
+ }
+
/* If we checked if "-a" works already, break here. */
if (diff_a_works != MAYBE)
break;
@@ -797,10 +804,13 @@ ex_diffupdate(eap)
@@ -796,10 +803,13 @@ ex_diffupdate(eap)
continue;
if (diff_write(buf, tmp_new) == FAIL)
continue;
@ -48,16 +49,16 @@
- /* Read the diff output and add each entry to the diff list. */
- diff_read(idx_orig, idx_new, tmp_diff);
+ retval = diff_file(tmp_orig, tmp_new, tmp_diff);
+ if (retval == 2)
+ EMSG(_("E97: Cannot create diffs"));
+ if(retval == 2)
+ EMSG(_("E97: Cannot create diffs"));
+ else {
+ /* Read the diff output and add each entry to the diff list. */
+ diff_read(idx_orig, idx_new, tmp_diff);
+ /* Read the diff output and add each entry to the diff list. */
+ diff_read(idx_orig, idx_new, tmp_diff);
+ }
mch_remove(tmp_diff);
mch_remove(tmp_new);
}
@@ -820,13 +830,14 @@ theend:
@@ -819,13 +829,14 @@ theend:
/*
* Make a diff between files "tmp_orig" and "tmp_new", results in "tmp_diff".
*/
@ -70,10 +71,10 @@
{
char_u *cmd;
+ int retval=0;
size_t len;
#ifdef FEAT_EVAL
if (*p_dex != NUL)
@@ -860,13 +871,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
@@ -861,13 +872,14 @@ diff_file(tmp_orig, tmp_new, tmp_diff)
#ifdef FEAT_AUTOCMD
block_autocmds(); /* Avoid ShellCmdPost stuff */
#endif

19
vim-7.3-disable_gcc_warning_eval_c.patch Normal file
View File

@ -0,0 +1,19 @@
diff -rup vim73.orig/src/eval.c vim73/src/eval.c
--- vim73.orig/src/eval.c 2010-08-09 22:12:14.000000000 +0200
+++ vim73/src/eval.c 2010-11-22 08:52:10.660213250 +0100
@@ -10,6 +10,15 @@
/*
* eval.c: Expression evaluation.
*/
+
+// This workaround disable the GCC compiler warning only in this code file
+// because the code is safe.
+// http://lists.opensuse.org/opensuse-packaging/2010-11/msg00182.html
+#ifdef _FORTIFY_SOURCE
+#undef _FORTIFY_SOURCE
+#define _FORTIFY_SOURCE 1
+#endif
+
#if defined(MSDOS) || defined(WIN16) || defined(WIN32) || defined(_WIN64)
# include "vimio.h" /* for mch_open(), must be before vim.h */
#endif

27
vim-7.3-disable_lang_no.patch Normal file
View File

@ -0,0 +1,27 @@
diff -rup vim73.orig/src/po/Makefile vim73/src/po/Makefile
--- vim73.orig/src/po/Makefile 2010-08-07 13:37:24.000000000 +0200
+++ vim73/src/po/Makefile 2010-11-21 11:10:56.770088582 +0100
@@ -20,7 +20,6 @@ LANGUAGES = \
ko \
ko.UTF-8 \
nb \
- no \
pl \
pt_BR \
ru \
@@ -49,7 +48,6 @@ MOFILES = \
ko.mo \
ko.UTF-8.mo \
nb.mo \
- no.mo \
pl.mo \
pt_BR.mo \
ru.mo \
@@ -88,7 +86,6 @@ CHECKFILES = \
ko.ck \
ko.UTF-8.ck \
nb.ck \
- no.ck \
pl.ck \
pt_BR.ck \
ru.ck \

19
vim-7.2-filetype_apparmor.patch → vim-7.3-filetype_apparmor.patch
View File

@ -1,13 +1,9 @@
---
runtime/filetype.vim | 4
runtime/syntax/apparmor.vim | 219 ++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 223 insertions(+)
--- vim72/runtime/filetype.vim
+++ vim72/runtime/filetype.vim
diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 05:43:34.224214064 +0100
@@ -113,6 +113,10 @@ au BufNewFile,BufRead proftpd.conf* cal
au BufNewFile,BufRead .htaccess setf apache
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf* call s:StarSetf('apache')
au BufNewFile,BufRead .htaccess,/etc/httpd/*.conf setf apache
au BufNewFile,BufRead httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/httpd/conf.d/*.conf* call s:StarSetf('apache')
+" AppArmor
+au BufNewFile,BufRead */etc/apparmor.d/* setf apparmor
@ -16,8 +12,9 @@
" XA65 MOS6510 cross assembler
au BufNewFile,BufRead *.a65 setf a65
--- vim72/runtime/syntax/apparmor.vim
+++ vim72/runtime/syntax/apparmor.vim
diff -rupN vim73.orig/runtime/syntax/apparmor.vim vim73/runtime/syntax/apparmor.vim
--- vim73.orig/runtime/syntax/apparmor.vim 1970-01-01 01:00:00.000000000 +0100
+++ vim73/runtime/syntax/apparmor.vim 2010-11-21 05:43:34.225347247 +0100
@@ -0,0 +1,219 @@
+" $Id: apparmor.vim.in,v 1.6 2008/09/25 00:13:43 cb Exp $
+"

34
vim-7.1-filetype_changes.patch → vim-7.3-filetype_changes.patch
View File

@ -1,7 +1,19 @@
Index: vim71/runtime/syntax/changes.vim
===================================================================
--- /dev/null
+++ vim71/runtime/syntax/changes.vim
diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 06:22:56.650975029 +0100
@@ -393,6 +393,9 @@ au BufNewFile,BufRead *.css setf css
" Century Term Command Scripts (*.cmd too)
au BufNewFile,BufRead *.con setf cterm
+" SuSE .changes file
+au BufNewFile,BufRead *.changes setf changes
+
" Changelog
au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
\ setf debchangelog
diff -rupN vim73.orig/runtime/syntax/changes.vim vim73/runtime/syntax/changes.vim
--- vim73.orig/runtime/syntax/changes.vim 1970-01-01 01:00:00.000000000 +0100
+++ vim73/runtime/syntax/changes.vim 2010-11-21 06:22:56.649094929 +0100
@@ -0,0 +1,37 @@
+" Vim syntax file
+" Filename: changes.vim
@ -40,17 +52,3 @@ Index: vim71/runtime/syntax/changes.vim
+
+" Syntax name
+let b:current_syntax = "changes"
Index: vim71/runtime/filetype.vim
===================================================================
--- vim71.orig/runtime/filetype.vim
+++ vim71/runtime/filetype.vim
@@ -369,6 +369,9 @@ au BufNewFile,BufRead *.css setf css
" Century Term Command Scripts (*.cmd too)
au BufNewFile,BufRead *.con setf cterm
+" SuSE .changes file
+au BufNewFile,BufRead *.changes setf changes
+
" Changelog
au BufNewFile,BufRead changelog.Debian,changelog.dch,NEWS.Debian,NEWS.dch
\ setf debchangelog

12
vim-7.0-filetype_ftl.patch → vim-7.3-filetype_ftl.patch
View File

@ -1,6 +1,7 @@
--- vim70/runtime/filetype.vim.orig 2006-07-11 15:39:06.000000000 +0200
+++ vim70/runtime/filetype.vim 2006-07-11 16:16:54.000000000 +0200
@@ -2187,3 +2187,7 @@
diff -rupN vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 05:13:00.462213463 +0100
@@ -2512,3 +2512,7 @@ endfunc
" Restore 'cpoptions'
let &cpo = s:cpo_save
unlet s:cpo_save
@ -8,8 +9,9 @@
+" FreeMarker templates
+au BufNewFile,BufRead *.ftl setf ftl
+
--- vim70/runtime/syntax/ftl.vim.orig 1970-01-01 01:00:00.000000000 +0100
+++ vim70/runtime/syntax/ftl.vim 2006-07-11 16:16:54.000000000 +0200
diff -rupN vim73.orig/runtime/syntax/ftl.vim vim73/runtime/syntax/ftl.vim
--- vim73.orig/runtime/syntax/ftl.vim 1970-01-01 01:00:00.000000000 +0100
+++ vim73/runtime/syntax/ftl.vim 2010-11-21 05:13:00.462213463 +0100
@@ -0,0 +1,36 @@
+" Vim syntax file
+" Language: FreeMarker Template Language (FTL)

52
vim-7.1-filetype_spec.patch → vim-7.3-filetype_spec.patch
View File

@ -1,30 +1,7 @@
Index: runtime/syntax/spec.vim
===================================================================
--- runtime/syntax/spec.vim.orig
+++ runtime/syntax/spec.vim
@@ -105,7 +105,7 @@ syn case ignore
"%% PreAmble Section %%
"Copyright and Serial were deprecated by License and Epoch
syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|Recommends\|Suggests\|Freshens\|EssentialFor\|Supplements\|Enhances\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
"%% Description Section %%
syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
@@ -114,7 +114,7 @@ syn region specDescriptionArea matchgrou
syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
"%% Scripts Section %%
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|check\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
"%% Changelog Section %%
syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense
Index: runtime/filetype.vim
===================================================================
--- runtime/filetype.vim.orig
+++ runtime/filetype.vim
@@ -1732,7 +1732,7 @@ endfunc
diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 05:57:07.132983365 +0100
@@ -1897,7 +1897,7 @@ endfunc
" Spec (Linux RPM)
@ -33,3 +10,24 @@ Index: runtime/filetype.vim
" Speedup (AspenTech plant simulator)
au BufNewFile,BufRead *.speedup,*.spdata,*.spd setf spup
diff -rup vim73.orig/runtime/syntax/spec.vim vim73/runtime/syntax/spec.vim
--- vim73.orig/runtime/syntax/spec.vim 2010-05-15 13:03:57.000000000 +0200
+++ vim73/runtime/syntax/spec.vim 2010-11-21 05:57:07.130970392 +0100
@@ -104,7 +104,7 @@ syn case ignore
"%% PreAmble Section %%
"Copyright and Serial were deprecated by License and Epoch
syn region specPreAmbleDeprecated oneline matchgroup=specError start='^\(Copyright\|Serial\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
-syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
+syn region specPreAmble oneline matchgroup=specCommand start='^\(Prereq\|Summary\|Name\|Version\|Packager\|Requires\|Icon\|URL\|Source\d*\|Patch\d*\|Prefix\|Packager\|Group\|License\|Release\|BuildRoot\|Distribution\|Vendor\|Provides\|ExclusiveArch\|ExcludeArch\|ExclusiveOS\|Obsoletes\|BuildArch\|BuildArchitectures\|BuildRequires\|BuildConflicts\|BuildPreReq\|Conflicts\|AutoRequires\|AutoReq\|AutoReqProv\|AutoProv\|Epoch\|Recommends\|Suggests\|Freshens\|EssentialFor\|Supplements\|Enhances\)' end='$' contains=specEmail,specURL,specURLMacro,specLicense,specColon,specVariables,specSpecialChar,specMacroIdentifier
"%% Description Section %%
syn region specDescriptionArea matchgroup=specSection start='^%description' end='^%'me=e-1 contains=specDescriptionOpts,specEmail,specURL,specNumber,specMacroIdentifier,specComment
@@ -113,7 +113,7 @@ syn region specDescriptionArea matchgrou
syn region specPackageArea matchgroup=specSection start='^%package' end='^%'me=e-1 contains=specPackageOpts,specPreAmble,specComment
"%% Scripts Section %%
-syn region specScriptArea matchgroup=specSection start='^%\(prep\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
+syn region specScriptArea matchgroup=specSection start='^%\(prep\|check\|build\|install\|clean\|pre\|postun\|preun\|post\)\>' skip='^%{\|^%\(define\|patch\d*\|configure\|GNUconfigure\|setup\|find_lang\|makeinstall\)\>' end='^%'me=e-1 contains=specSpecialVariables,specVariables,@specCommands,specVariables,shDo,shFor,shCaseEsac,specNoNumberHilite,specCommandOpts,shComment,shIf,specSpecialChar,specMacroIdentifier,specSectionMacroArea,specSectionMacroBracketArea,shOperator,shQuote1,shQuote2
"%% Changelog Section %%
syn region specChangelogArea matchgroup=specSection start='^%changelog' end='^%'me=e-1 contains=specEmail,specURL,specWeekday,specMonth,specNumber,specComment,specLicense

7
vim-7.0-grub.patch → vim-7.3-grub.patch
View File

@ -1,6 +1,7 @@
--- runtime/filetype.vim
+++ runtime/filetype.vim
@@ -146,7 +146,7 @@
diff -rup vim73.orig/runtime/filetype.vim vim73/runtime/filetype.vim
--- vim73.orig/runtime/filetype.vim 2010-08-03 22:44:00.000000000 +0200
+++ vim73/runtime/filetype.vim 2010-11-21 05:38:50.752088445 +0100
@@ -157,7 +157,7 @@ au BufNewFile,BufRead *.asp
\ endif
" Grub (must be before catch *.lst)

7
vim-7.0-gvimrc_fontset.patch → vim-7.3-gvimrc_fontset.patch
View File

@ -1,5 +1,6 @@
--- vim70/runtime/gvimrc_example.vim.orig 2004-06-07 16:32:41.000000000 +0200
+++ vim70/runtime/gvimrc_example.vim 2006-07-11 15:22:06.000000000 +0200
diff -rup vim73.orig/runtime/gvimrc_example.vim vim73/runtime/gvimrc_example.vim
--- vim73.orig/runtime/gvimrc_example.vim 2010-05-15 13:03:31.000000000 +0200
+++ vim73/runtime/gvimrc_example.vim 2010-11-21 04:47:29.891213689 +0100
@@ -13,9 +13,6 @@
" Make external commands work through a pipe instead of a pseudo-tty
"set noguipty
@ -10,7 +11,7 @@
set ch=2 " Make command line two lines high
set mousehide " Hide the mouse when typing text
@@ -57,3 +54,29 @@
@@ -57,3 +54,29 @@ if version >= 500
highlight Special gui=NONE guibg=grey95
endif

12
vim-7.3-help_tags.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rup vim73.orig/runtime/doc/Makefile vim73/runtime/doc/Makefile
--- vim73.orig/runtime/doc/Makefile 2010-07-21 20:38:06.000000000 +0200
+++ vim73/runtime/doc/Makefile 2010-11-21 05:19:30.308088771 +0100
@@ -310,6 +310,7 @@ all: tags vim.man evim.man vimdiff.man v
# Use Vim to generate the tags file. Can only be used when Vim has been
# compiled and installed. Supports multiple languages.
vimtags: $(DOCS)
+ export VIMRUNTIME=../; \
$(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit
# Use "doctags" to generate the tags file. Only works for English!
Nur in vim73/runtime/doc: Makefile.orig.

17
vim-7.0-highlight_fstab.patch → vim-7.3-highlight_fstab.patch
View File

@ -1,8 +1,7 @@
Index: vim72/runtime/syntax/fstab.vim
===================================================================
--- vim72.orig/runtime/syntax/fstab.vim 2008-01-16 21:52:16.000000000 +0100
+++ vim72/runtime/syntax/fstab.vim 2008-08-12 12:31:27.000000000 +0200
@@ -29,7 +29,7 @@ syn match fsOperator /[,=:#]/
diff -rup vim73.orig/runtime/syntax/fstab.vim vim73/runtime/syntax/fstab.vim
--- vim73.orig/runtime/syntax/fstab.vim 2010-05-15 13:03:56.000000000 +0200
+++ vim73/runtime/syntax/fstab.vim 2010-11-21 05:01:19.457089623 +0100
@@ -30,7 +30,7 @@ syn match fsOperator /[,=:#]/
" Device
syn cluster fsDeviceCluster contains=fsOperator,fsDeviceKeyword,fsDeviceError
syn match fsDeviceError /\%([^a-zA-Z0-9_\/#@:\.-]\|^\w\{-}\ze\W\)/ contained
@ -11,21 +10,21 @@ Index: vim72/runtime/syntax/fstab.vim
syn keyword fsDeviceKeyword contained LABEL nextgroup=fsDeviceLabel
syn keyword fsDeviceKeyword contained UUID nextgroup=fsDeviceUUID
syn keyword fsDeviceKeyword contained sshfs nextgroup=fsDeviceSshfs
@@ -46,7 +46,7 @@ syn keyword fsMountPointKeyword containe
@@ -47,7 +47,7 @@ syn keyword fsMountPointKeyword containe
" Type
syn cluster fsTypeCluster contains=fsTypeKeyword,fsTypeUnknown
syn match fsTypeUnknown /\s\+\zs\w\+/ contained
-syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
-syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs cd9660 cfs cifs coda cramfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
+syn keyword fsTypeKeyword contained adfs ados affs atfs audiofs auto autofs befs bfs binfmt_misc cd9660 cfs cifs coda cramfs debugfs devfs devpts e2compr efs ext2 ext2fs ext3 ext4 ext4dev fdesc ffs filecore fuse hfs hpfs iso9660 jffs jffs2 jfs kernfs lfs linprocfs mfs minix msdos ncpfs nfs none ntfs null nwfs overlay ovlfs portal proc procfs ptyfs qnx4 reiserfs romfs rpc_pipefs shm smbfs sshfs std subfs swap sysfs sysv tcfs tmpfs udf ufs umap umsdos union usbfs userfs vfat vs3fs vxfs wrapfs wvfs xfs zisofs
" Options
" -------
@@ -58,7 +58,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
@@ -59,7 +59,7 @@ syn match fsOptionsString /[a-zA-Z0-9_-]
syn keyword fsOptionsYesNo yes no
syn cluster fsOptionsCheckCluster contains=fsOptionsExt2Check,fsOptionsFatCheck
syn keyword fsOptionsSize 512 1024 2048
-syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user[s] xx
+syn keyword fsOptionsGeneral async atime auto bind current defaults dev devgid devmode devmtime devuid dirsync exec force fstab kudzu loop managed mand move noatime noauto noclusterr noclusterw nodev nodevmtime nodiratime noexec nomand nosuid nosymfollow nouser owner pamconsole rbind rdonly remount ro rq rw suid suiddir supermount sw sync union update user users xx
syn match fsOptionsGeneral /_netdev/
" Options: adfs

7
vim-7.0-mktemp_tutor.patch → vim-7.3-mktemp_tutor.patch
View File

@ -1,6 +1,7 @@
--- vim70/src/vimtutor.orig 2004-06-07 16:32:27.000000000 +0200
+++ vim70/src/vimtutor 2006-07-11 16:28:08.000000000 +0200
@@ -11,8 +11,7 @@
diff -rup vim73.orig/src/vimtutor vim73/src/vimtutor
--- vim73.orig/src/vimtutor 2010-05-15 13:04:10.000000000 +0200
+++ vim73/src/vimtutor 2010-11-21 05:28:54.592338812 +0100
@@ -24,8 +24,7 @@ xx=$1
export xx
# We need a temp file for the copy. First try using a standard command.

7
vim-7.0-name_vimrc.patch → vim-7.3-name_vimrc.patch
View File

@ -1,6 +1,7 @@
--- vim70/src/feature.h.orig 2006-04-27 01:14:13.000000000 +0200
+++ vim70/src/feature.h 2006-07-11 16:28:08.000000000 +0200
@@ -898,12 +898,13 @@
diff -rup vim73.orig/src/feature.h vim73/src/feature.h
--- vim73.orig/src/feature.h 2010-07-27 21:45:42.000000000 +0200
+++ vim73/src/feature.h 2010-11-21 05:25:09.532342231 +0100
@@ -936,12 +936,13 @@
* SYS_VIMRC_FILE Name of the system-wide .vimrc file.
*/
/* #define SYS_VIMRC_FILE "/etc/vimrc" */

3
vim-7.3-patches.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4a70dc858cbe4976b69666de23d2d64f91156d834be2d854b7ef862f840f51a9
size 60748

6
vim-7.3-rpmlintrc Normal file
View File

@ -0,0 +1,6 @@
from Config import *
addFilter("vim-data.* devel-file-in-non-devel-package")
addFilter("vim-data.* file-not-in-%lang")
addFilter("vim-base.* package-with-huge-docs")

12
vim-7.3-ruby_ldflags_configure.patch Normal file
View File

@ -0,0 +1,12 @@
diff -rup vim73.orig/src/auto/configure vim73/src/auto/configure
--- vim73.orig/src/auto/configure 2010-08-13 16:17:15.000000000 +0200
+++ vim73/src/auto/configure 2010-11-21 05:34:08.471088555 +0100
@@ -6197,7 +6197,7 @@ $as_echo "$rubyhdrdir" >&6; }
if test "X$librubyarg" != "X"; then
RUBY_LIBS="$librubyarg $RUBY_LIBS"
fi
- rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]'`
+ rubyldflags=`$vi_cv_path_ruby -r rbconfig -e 'print Config::CONFIG["LDFLAGS"]' | sed 's/\\\\,/,/g'`
if test "X$rubyldflags" != "X"; then
rubyldflags=`echo "$rubyldflags" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'`
if test "X$rubyldflags" != "X"; then

7
vim-7.0-sh_is_bash.patch → vim-7.3-sh_is_bash.patch
View File

@ -1,6 +1,7 @@
--- vim70/runtime/syntax/sh.vim.orig 2006-04-13 18:46:09.000000000 +0200
+++ vim70/runtime/syntax/sh.vim 2006-07-11 16:08:09.000000000 +0200
@@ -54,6 +54,13 @@
diff -rup vim73.orig/runtime/syntax/sh.vim vim73/runtime/syntax/sh.vim
--- vim73.orig/runtime/syntax/sh.vim 2010-08-05 22:00:59.000000000 +0200
+++ vim73/runtime/syntax/sh.vim 2010-11-21 05:08:23.026990941 +0100
@@ -42,6 +42,13 @@ if !exists("b:is_kornshell") && !exists(
endif
endif

9
vim-7.3-use_awk.patch Normal file
View File

@ -0,0 +1,9 @@
diff -rup vim73.orig/runtime/tools/mve.awk vim73/runtime/tools/mve.awk
--- vim73.orig/runtime/tools/mve.awk 2010-05-15 13:04:00.000000000 +0200
+++ vim73/runtime/tools/mve.awk 2010-11-21 05:22:46.096963787 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/nawk -f
+#!/usr/bin/awk -f
#
# Change "nawk" to "awk" or "gawk" if you get errors.
#

3
vim-7.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d
size 9080692

40
vim.changes
View File

@ -1,3 +1,43 @@
-------------------------------------------------------------------
Mon Nov 22 09:03:54 CET 2010 - freespacer@gmx.de
- add disable_gcc_warning_eval_c.patch
http://lists.opensuse.org/opensuse-packaging/2010-11/msg00182.html
- add disable_lang_no.patch
- update spec file
-------------------------------------------------------------------
Sun Nov 21 08:15:17 CET 2010 - freespacer@gmx.de
- update to version 7.3
- clean up the additional vim patches and files
- remove vim-7.2-lang.tar.bz2 (obsolete)
- remove vim-7.2-extra.tar.bz2 (obsolete)
- remove ANNOUNCEMENT.vim-7.2 (obsolete)
- remove vim-7.0-no_nb.patch (obsolete)
- remove remove-terrible-hack.patch (obsolete)
- remove php.patch (obsolete)
- remove lib64.patch (obsolete)
- remove vim-7.2.257.patch (obsolete)
- remove flex-array.patch (responsible for broken build)
- disable lzma.patch (partly supported)
- add ANNOUNCEMENT.vim-7.3
- renew official patches from upstream
- renew gvimrc_fontset.patch
- renew highlight_fstab.patch
- renew sh_is_bash.patch
- renew filetype_ftl.patch
- renew help_tags.patch
- renew use_awk.patch
- renew name_vimrc.patch
- renew mktemp_tutor.patch
- renew ruby_ldflags_configure.patch
- renew grub.patch
- renew filetype_apparmor.patch
- renew diff_check.patch
- renew filetype_changes.patch
- update spec file
-------------------------------------------------------------------
Wed Nov 17 21:17:43 UTC 2010 - fisiu@opensuse.org

81
vim.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package vim (Version 7.2)
# spec file for package vim (Version 7.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -19,8 +19,8 @@
Name: vim
Version: 7.2
Release: 29
Version: 7.3
Release: 1
#
License: Other uncritical OpenSource License ; Charityware. http://vimdoc.sourceforge.net/htmldoc/uganda.html#license
Group: Productivity/Editors/Vi
@ -33,9 +33,9 @@ BuildRequires: gpm-devel
BuildRequires: gpm
%endif
#
%define pkg_version 7.2
%define pkg_version 7.3
%define official_ptchlvl 127
%define VIM_SUBDIR vim72
%define VIM_SUBDIR vim73
%define site_runtimepath /usr/share/vim/site
#
%define make make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/current MAKE="make -e" %{?jobs:-j%jobs}
@ -62,8 +62,6 @@ Recommends: vim-data = %{version}
#
Url: http://www.vim.org/
Source: ftp://ftp.vim.org/pub/vim/unix/vim-%{pkg_version}.tar.bz2
Source1: ftp://ftp.vim.org/pub/vim/extra/vim-%{pkg_version}-extra.tar.bz2
Source2: ftp://ftp.vim.org/pub/vim/extra/vim-%{pkg_version}-lang.tar.bz2
Source3: suse.vimrc
Source4: vimrc_example1
Source5: vimrc_example2
@ -79,30 +77,25 @@ Source19: gvim.desktop
Source20: spec.skeleton
Source21: dot.vimrc
Source22: vim.conf
Source98: %{name}-7.2-patches.bz2
Source99: vim-7.1-rpmlintrc
Patch1: %{name}-7.0-no_nb.patch
Patch4: %{name}-7.0-gvimrc_fontset.patch
Patch5: %{name}-7.0-highlight_fstab.patch
Patch6: %{name}-7.0-sh_is_bash.patch
Patch7: %{name}-7.0-filetype_ftl.patch
Patch8: %{name}-7.0-help_tags.patch
Patch9: %{name}-7.0-use_awk.patch
Patch10: %{name}-7.0-name_vimrc.patch
Patch11: %{name}-7.0-mktemp_tutor.patch
Patch12: %{name}-7.0-ruby_ldflags_configure.patch
Patch14: %{name}-7.0-grub.patch
Patch15: vim-7.2-filetype_apparmor.patch
Patch16: %{name}-7.0-flex-array.diff
Patch18: vim-7.1-filetype_spec.patch
Patch19: vim-7.2-diff_check.patch
Patch21: vim-7.1-filetype_changes.patch
Patch22: vim-7.1-remove-terrible-hack.patch
Patch23: vim-7.2-php.patch
Patch24: vim-7.2-lib64.patch
Patch25: vim-7.2-lzma-support.patch
# PATCH-FIX-UPSTREAM vim-7.2.257.patch bnc#536535 mmarek@novell.com -- Hide gtk assertions.
Patch26: vim-7.2.257.patch
Source98: %{name}-7.3-patches.tar.bz2
Source99: %{name}-7.3-rpmlintrc
Patch3: %{name}-7.3-disable_lang_no.patch
Patch4: %{name}-7.3-gvimrc_fontset.patch
Patch5: %{name}-7.3-highlight_fstab.patch
Patch6: %{name}-7.3-sh_is_bash.patch
Patch7: %{name}-7.3-filetype_ftl.patch
Patch8: %{name}-7.3-help_tags.patch
Patch9: %{name}-7.3-use_awk.patch
Patch10: %{name}-7.3-name_vimrc.patch
Patch11: %{name}-7.3-mktemp_tutor.patch
Patch12: %{name}-7.3-ruby_ldflags_configure.patch
Patch14: %{name}-7.3-grub.patch
Patch15: %{name}-7.3-filetype_apparmor.patch
Patch18: %{name}-7.3-filetype_spec.patch
Patch19: %{name}-7.3-diff_check.patch
Patch21: %{name}-7.3-filetype_changes.patch
#Patch25: vim-7.2-lzma-support.patch
Patch27: %{name}-7.3-disable_gcc_warning_eval_c.patch
Patch100: vim-7.1.314-CVE-2009-0316-debian.patch
# tbd??? %name-6.3-ga-utf8.diff
# tbd??? %name-6.3-initvals.diff
@ -293,7 +286,7 @@ Authors:
Bram Moolenaar <mool@oce.nl>
%prep
%setup -q -n %{VIM_SUBDIR} -b 1 -b 2 -b 98
%setup -q -n %{VIM_SUBDIR} -b 98
for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
test -e $p || break
test ${p#*/%{pkg_version}.} -le %{official_ptchlvl} || exit 1
@ -301,7 +294,7 @@ for p in ../vim-%{pkg_version}-patches/%{pkg_version}*; do
patch -s -p0 < $p
done
unset p
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@ -311,21 +304,17 @@ unset p
%patch10 -p1
%patch11 -p1
%patch12 -p1
%patch14
%patch14 -p1
%patch15 -p1
%patch16
%patch18
%patch18 -p1
%patch19 -p1
%patch21 -p1
%patch22
%patch23
%patch24
%patch25
%patch26
#%patch25
%patch27 -p1
%patch100 -p1
cp %{S:3} %{S:4} %{S:5} %{S:6} %{S:8} %{S:9} %{S:10} .
rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
#rename no nb $RPM_BUILD_DIR/vim*/src/po/no.*
#rename menu_no menu_nb $RPM_BUILD_DIR/vim*/runtime/lang/menu_no*
%build
export CFLAGS="%{optflags} -Wall -pipe -fno-strict-aliasing"
@ -460,7 +449,7 @@ install -m 0644 %{S:21} %{buildroot}/etc/skel/.vimrc
%{__install} -d -m 0755 %{buildroot}%{_docdir}/{,g}vim/
%{__install} -D -m 0644 \
vimrc_example1 vimrc_example2 suse.vimrc \
README.txt README_src.txt README_unix.txt README_lang.txt src/INSTALL ANNOUNCEMENT.vim-7.2 \
README.txt README_src.txt README_unix.txt src/INSTALL ANNOUNCEMENT.vim-7.3 \
%{buildroot}%{_docdir}/vim/
# gvim
%{__install} -D -m 0644 \
@ -556,7 +545,8 @@ fi
%config(noreplace) /etc/vimrc
%config(noreplace) /etc/skel/.vimrc
%ghost /etc/alternatives/vim
/etc/tmpfiles.d/vim.conf
%dir /etc/tmpfiles.d
%config(noreplace) /etc/tmpfiles.d/vim.conf
# symlinks
/bin/vi
/bin/vim
@ -667,6 +657,7 @@ fi
%{_datadir}/vim/%{VIM_SUBDIR}/tools/ref
%{_datadir}/vim/%{VIM_SUBDIR}/tools/shtags.1
%{_datadir}/vim/%{VIM_SUBDIR}/tools/shtags.pl
%{_datadir}/vim/%{VIM_SUBDIR}/tools/unicode.vim
%{_datadir}/vim/%{VIM_SUBDIR}/tools/vim132
%{_datadir}/vim/%{VIM_SUBDIR}/tools/vimm
%{_datadir}/vim/%{VIM_SUBDIR}/tools/vimspell.sh