diff --git a/vim-7.0-help_tags.patch b/vim-7.0-help_tags.patch index 26f1274..99a5dcb 100644 --- a/vim-7.0-help_tags.patch +++ b/vim-7.0-help_tags.patch @@ -1,10 +1,12 @@ ---- vim70/runtime/doc/Makefile.orig 2006-04-27 17:17:05.000000000 +0200 -+++ vim70/runtime/doc/Makefile 2006-07-11 16:20:22.000000000 +0200 -@@ -299,6 +299,7 @@ +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 ." -c quit + $(VIMEXE) -u NONE -esX -c "helptags ++t ." -c quit # Use "doctags" to generate the tags file. Only works for English! diff --git a/vim-upstream-patches-7.1-135.patch.bz2 b/vim-upstream-patches-7.1-135.patch.bz2 deleted file mode 100644 index 82a703d..0000000 --- a/vim-upstream-patches-7.1-135.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75cf4e485a565586d1a535c4d6fc151a865bfece72ebf2de11247ec4083b5b4d -size 102624 diff --git a/vim-upstream-patches-7.1-266.patch.bz2 b/vim-upstream-patches-7.1-266.patch.bz2 new file mode 100644 index 0000000..ffe6285 --- /dev/null +++ b/vim-upstream-patches-7.1-266.patch.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cddfc9a6ae1e7cc8a082f9018a9f9328187edddfa261d5e7797fd7c6d9150031 +size 188010 diff --git a/vim.changes b/vim.changes index a69dca4..de1892a 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 28 14:30:14 CET 2008 - mkoenig@suse.de + +- update to patchlevel 266 + * fixes crash on completion [bnc#361844] +- update ycp syntax file [bnc#364509] + ------------------------------------------------------------------- Thu Jan 31 12:38:24 CET 2008 - mkoenig@suse.de diff --git a/vim.spec b/vim.spec index 0b440b3..57eaf7a 100644 --- a/vim.spec +++ b/vim.spec @@ -10,9 +10,10 @@ # norootforbuild + Name: vim Version: 7.1 -Release: 81 +Release: 93 # License: Other uncritical OpenSource License; http://vimdoc.sourceforge.net/htmldoc/uganda.html#license Group: Productivity/Editors/Vi @@ -21,7 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: db-devel fdupes gettext-devel gpm gtk2-devel libacl-devel ncurses-devel perl python-devel ruby-devel tcl-devel update-alternatives update-desktop-files # %define pkg_version 7.1 -%define official_ptchlvl 135 +%define official_ptchlvl 266 %define VIM_SUBDIR vim71 %define site_runtimepath /usr/share/vim/site # @@ -654,6 +655,10 @@ fi %endif %changelog +* Thu Feb 28 2008 mkoenig@suse.de +- update to patchlevel 266 + * fixes crash on completion [bnc#361844] +- update ycp syntax file [bnc#364509] * Thu Jan 31 2008 mkoenig@suse.de - get perl version we build with dynamically rather than hardcoding it. diff --git a/ycp.vim b/ycp.vim index c1c0e69..804cdc7 100644 --- a/ycp.vim +++ b/ycp.vim @@ -86,6 +86,7 @@ syn keyword ycpBuiltin YaST2Version SuSEVersion syn keyword ycpBuiltin AskForExistingDirectory syn keyword ycpBuiltin AskForExistingFile syn keyword ycpBuiltin AskForSaveFileName +syn keyword ycpBuiltin Beep syn keyword ycpBuiltin BusyCursor syn keyword ycpBuiltin ChangeWidget syn keyword ycpBuiltin CheckShortcuts @@ -111,6 +112,7 @@ syn keyword ycpBuiltin RecordMacro syn keyword ycpBuiltin RedrawScreen syn keyword ycpBuiltin ReplaceWidget syn keyword ycpBuiltin RunPkgSelection +syn keyword ycpBuiltin RunInTerminal syn keyword ycpBuiltin SetConsoleFont syn keyword ycpBuiltin SetFocus syn keyword ycpBuiltin SetFunctionKeys @@ -123,6 +125,7 @@ syn keyword ycpBuiltin TimeoutUserInput syn keyword ycpBuiltin UserInput syn keyword ycpBuiltin WaitForEvent syn keyword ycpBuiltin WidgetExists +syn keyword ycpBuiltin WizardCommand " YCP builtins syn keyword ycpBuiltin contains @@ -187,6 +190,7 @@ syn keyword ycpBoolean true false nil " YCP widgets syn keyword ycpWidget Bottom syn keyword ycpWidget CheckBox +syn keyword ycpWidget CheckBoxFrame syn keyword ycpWidget ComboBox syn keyword ycpWidget Empty syn keyword ycpWidget Frame @@ -202,11 +206,16 @@ syn keyword ycpWidget HWeight syn keyword ycpWidget Heading syn keyword ycpWidget IconButton syn keyword ycpWidget Image +syn keyword ycpWidget InputField syn keyword ycpWidget IntField syn keyword ycpWidget Label syn keyword ycpWidget Left syn keyword ycpWidget LogView +syn keyword ycpWidget MarginBox syn keyword ycpWidget MenuButton +syn keyword ycpWidget MinHeight +syn keyword ycpWidget MinSize +syn keyword ycpWidget MinWidth syn keyword ycpWidget MultiLineEdit syn keyword ycpWidget MultiSelectionBox syn keyword ycpWidget PackageSelector @@ -230,13 +239,23 @@ syn keyword ycpWidget VSquash syn keyword ycpWidget VStretch syn keyword ycpWidget VWeight syn keyword ycpWidget PkgSpecial +syn keyword ycpWidget BusyIndicator syn keyword ycpWidget BarGraph syn keyword ycpWidget ColoredLabel +syn keyword ycpWidget Date +syn keyword ycpWidget DateField syn keyword ycpWidget DownloadProgress +syn keyword ycpWidget DumbTab syn keyword ycpWidget DummySpecialWidget +syn keyword ycpWidget HMultiProgressMeter +syn keyword ycpWidget VMultiProgressMeter syn keyword ycpWidget PartitionSplitter +syn keyword ycpWidget PatternSelector syn keyword ycpWidget Slider +syn keyword ycpWidget Time +syn keyword ycpWidget TimeField +syn keyword ycpWidget TimezoneSelector syn keyword ycpWidget CurrentButton syn keyword ycpWidget CurrentItem @@ -260,6 +279,8 @@ syn keyword ycpWidget EasterEgg syn keyword ycpWidgetSpecial animated syn keyword ycpWidgetSpecial autoScrollDown syn keyword ycpWidgetSpecial autoShortcut +syn keyword ycpWidgetSpecial boldFont +syn keyword ycpWidgetSpecial centered syn keyword ycpWidgetSpecial countShowDelta syn keyword ycpWidgetSpecial debugLayout syn keyword ycpWidgetSpecial decorated @@ -272,12 +293,20 @@ syn keyword ycpWidgetSpecial hstretch syn keyword ycpWidgetSpecial hvstretch syn keyword ycpWidgetSpecial immediate syn keyword ycpWidgetSpecial infocolor +syn keyword ycpWidgetSpecial invertAutoEnable syn keyword ycpWidgetSpecial keepSorting +syn keyword ycpWidgetSpecial keyEvents +syn keyword ycpWidgetSpecial mainDialog +syn keyword ycpWidgetSpecial noAutoEnable syn keyword ycpWidgetSpecial notify syn keyword ycpWidgetSpecial outputField syn keyword ycpWidgetSpecial plainText +syn keyword ycpWidgetSpecial repoMode syn keyword ycpWidgetSpecial scaleToFit +syn keyword ycpWidgetSpecial searchMode syn keyword ycpWidgetSpecial shrinkable +syn keyword ycpWidgetSpecial stepsEnabled +syn keyword ycpWidgetSpecial summaryMode syn keyword ycpWidgetSpecial testMode syn keyword ycpWidgetSpecial tiled syn keyword ycpWidgetSpecial updateMode @@ -325,10 +354,17 @@ syn keyword ycpWidgetSpecial BulletSquare syn keyword ycpWidgetSpecial id syn keyword ycpWidgetSpecial opt +syn keyword ycpWidgetSpecial icon syn keyword ycpWidgetSpecial item +syn keyword ycpWidgetSpecial cell syn keyword ycpWidgetSpecial menu syn keyword ycpWidgetSpecial header syn keyword ycpWidgetSpecial rgb +syn keyword ycpWidgetSpecial leftMargin +syn keyword ycpWidgetSpecial rightMargin +syn keyword ycpWidgetSpecial topMargin +syn keyword ycpWidgetSpecial bottomMargin +syn keyword ycpWidgetSpecial BackgroundPixmap " comment miniles if !exists("c_minlines")