diff --git a/7.0.079_patched b/7.0.079_patched
new file mode 100644
index 0000000..297ef54
--- /dev/null
+++ b/7.0.079_patched
@@ -0,0 +1,72 @@
+To: vim-dev@vim.org
+Subject: Patch 7.0.079
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.079
+Problem: Russian tutor doesn't work when 'encoding' is "utf-8".
+Solution: Use tutor.ru.utf-8 as the master, and generate the other encodings
+ from it. Select the right tutor depending on 'encoding'. (Alexey
+ Froloff)
+Files: runtime/tutor/Makefile, runtime/tutor/tutor.vim,
+ runtime/tutor/tutor.ru.utf-8
+
+
+*** ../vim-7.0.079/runtime/tutor/Makefile Sun Jun 13 20:35:48 2004
+--- runtime/tutor/Makefile Fri Sep 1 20:38:20 2006
+***************
+*** 2,9 ****
+ #
+ # The Japanese tutor exists in three encodings. Use the UTF-8 version as the
+ # original and create the others with conversion.
+
+! all: tutor.ja.sjis tutor.ja.euc tutor.ko.euc
+
+ tutor.ja.sjis: tutor.ja.utf-8
+ nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
+--- 2,13 ----
+ #
+ # The Japanese tutor exists in three encodings. Use the UTF-8 version as the
+ # original and create the others with conversion.
++ #
++ # Similarly for Russian and Korean
+
+! all: tutor.ja.sjis tutor.ja.euc \
+! tutor.ko.euc \
+! tutor.ru tutor.ru.cp1251
+
+ tutor.ja.sjis: tutor.ja.utf-8
+ nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
+***************
+*** 13,15 ****
+--- 17,25 ----
+
+ tutor.ko.euc: tutor.ko.utf-8
+ iconv -f UTF-8 -t EUC-KR tutor.ko.utf-8 > tutor.ko.euc
++
++ tutor.ru: tutor.ru.utf-8
++ iconv -f UTF-8 -t KOI8-R tutor.ru.utf-8 > tutor.ru
++
++ tutor.ru.cp1251: tutor.ru.utf-8
++ iconv -f UTF-8 -t cp1251 tutor.ru.utf-8 > tutor.ru.cp1251
+*** ../vim-7.0.079/src/version.c Sat Sep 2 14:53:09 2006
+--- src/version.c Sat Sep 2 14:20:15 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 79,
+ /**/
+
+--
+Eight Megabytes And Continually Swapping.
+
+ /// 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 ///
diff --git a/7.0.095_patched b/7.0.095_patched
new file mode 100644
index 0000000..1ed06a1
--- /dev/null
+++ b/7.0.095_patched
@@ -0,0 +1,70 @@
+To: vim-dev@vim.org
+Subject: Patch 7.0.095
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.095
+Problem: The Greek tutor is not available in utf-8. "el" is used for the
+ language, only "gr" for the country is recognized.
+Solution: Add the utf-8 Greek tutor. Use it for conversion to iso-8859-7
+ and cp737. (Lefteris Dimitroulakis)
+Files: runtime/tutor/Makefile, runtime/tutor/tutor.gr.utf-8,
+ runtime/tutor/tutor.vim
+
+
+*** ../vim-7.0.094/runtime/tutor/Makefile Sat Sep 2 14:54:17 2006
+--- runtime/tutor/Makefile Sun Sep 10 11:56:54 2006
+***************
+*** 7,13 ****
+
+ all: tutor.ja.sjis tutor.ja.euc \
+ tutor.ko.euc \
+! tutor.ru tutor.ru.cp1251
+
+ tutor.ja.sjis: tutor.ja.utf-8
+ nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
+--- 7,14 ----
+
+ all: tutor.ja.sjis tutor.ja.euc \
+ tutor.ko.euc \
+! tutor.ru tutor.ru.cp1251 \
+! tutor.gr tutor.gr.cp737
+
+ tutor.ja.sjis: tutor.ja.utf-8
+ nkf -WXs tutor.ja.utf-8 > tutor.ja.sjis
+***************
+*** 23,25 ****
+--- 24,32 ----
+
+ tutor.ru.cp1251: tutor.ru.utf-8
+ iconv -f UTF-8 -t cp1251 tutor.ru.utf-8 > tutor.ru.cp1251
++
++ tutor.gr: tutor.gr.utf-8
++ iconv -f UTF-8 -t ISO-8859-7 tutor.gr.utf-8 > tutor.gr
++
++ tutor.gr.cp737: tutor.gr.utf-8
++ iconv -f UTF-8 -t cp737 tutor.gr.utf-8 > tutor.gr.cp737
+*** ../vim-7.0.094/src/version.c Sat Sep 9 14:51:43 2006
+--- src/version.c Sun Sep 10 13:19:23 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 95,
+ /**/
+
+--
+FATHER: You killed eight wedding guests in all!
+LAUNCELOT: Er, Well ... the thing is ... I thought your son was a lady.
+FATHER: I can understand that.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// 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 ///
diff --git a/7.0.100 b/7.0.100
new file mode 100644
index 0000000..222e978
--- /dev/null
+++ b/7.0.100
@@ -0,0 +1,64 @@
+To: vim-dev@vim.org
+Subject: Patch 7.0.100
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.100
+Problem: "zug" may report the wrong filename. (Lawrence Kesteloot)
+Solution: Call home_replace() to fill NameBuff[].
+Files: src/spell.c
+
+
+*** ../vim-7.0.099/src/spell.c Tue Aug 29 17:28:56 2006
+--- src/spell.c Mon Sep 11 20:45:35 2006
+***************
+*** 1483,1489 ****
+ else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND
+ || !word_ends))
+ {
+! /* If there is no flag or the word is shorter than
+ * COMPOUNDMIN reject it quickly.
+ * Makes you wonder why someone puts a compound flag on a word
+ * that's too short... Myspell compatibility requires this
+--- 1483,1489 ----
+ else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND
+ || !word_ends))
+ {
+! /* If there is no compound flag or the word is shorter than
+ * COMPOUNDMIN reject it quickly.
+ * Makes you wonder why someone puts a compound flag on a word
+ * that's too short... Myspell compatibility requires this
+***************
+*** 9336,9342 ****
+--- 9336,9345 ----
+ {
+ fputc('#', fd);
+ if (undo)
++ {
++ home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE);
+ smsg((char_u *)_("Word removed from %s"), NameBuff);
++ }
+ }
+ fseek(fd, fpos_next, SEEK_SET);
+ }
+*** ../vim-7.0.099/src/version.c Sun Sep 10 21:38:48 2006
+--- src/version.c Mon Sep 11 21:36:13 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 100,
+ /**/
+
+--
+Be nice to your kids... they'll be the ones choosing your nursing home.
+
+ /// 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 ///
diff --git a/README.patches b/README.patches
index eaa9c96..7758824 100644
--- a/README.patches
+++ b/README.patches
@@ -124,3 +124,4 @@ Individual patches for Vim 7.0:
2617 7.0.097 tab pages line was not updated for ":tabclose N"
2196 7.0.098 redirection didn't work inside cmdline completion
2189 7.0.099 GUI: scrolling causes problems for the popup menu
+ 2086 7.0.100 "zug" may report the wrong filename
diff --git a/vim.spec b/vim.spec
index cad0e08..d034e7b 100644
--- a/vim.spec
+++ b/vim.spec
@@ -15,7 +15,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim70%{?beta}
-%define patchlevel 099
+%define patchlevel 100
Summary: The VIM editor.
Name: vim
@@ -126,7 +126,7 @@ Patch075: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.075
Patch076: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.076
Patch077: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.077
Patch078: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.078
-Patch079: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.079
+Patch079: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.079_patched
Patch080: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.080
Patch081: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.081
Patch082: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.082
@@ -142,11 +142,12 @@ Patch091: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.091
Patch092: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.092
Patch093: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.093
Patch094: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.094
-Patch095: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.095
+Patch095: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.095_patched
Patch096: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.096
Patch097: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.097
Patch098: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.098
Patch099: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.099
+Patch100: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.100
Patch3000: vim-7.0-syntax.patch
@@ -280,10 +281,14 @@ chmod -x runtime/tools/mve.awk
%patch2010 -p1
perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
+# Update all runtime files
+%{__tar} xjf %{SOURCE13}
+
# Base patches...
# for i in `seq 1 14`; do printf "%%patch%03d -p0 \n" $i; done
%patch001 -p0
-%patch002 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch002 -p0
%patch003 -p0
%patch004 -p0
# Win32:
@@ -293,9 +298,11 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch007 -p0
%patch008 -p0
%patch009 -p0
-%patch010 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch010 -p0
%patch011 -p0
-%patch012 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch012 -p0
%patch013 -p0
%patch014 -p0
%patch015 -p0
@@ -320,7 +327,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch031 -p0
# Win32
#patch032 -p0
-%patch033 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch033 -p0
%patch034 -p0
%patch035 -p0
%patch036 -p0
@@ -334,10 +342,12 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch044 -p0
# Win32:
#patch045 -p0
-%patch046 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch046 -p0
%patch047 -p0
-%patch048 -p0
-%patch049 -p0
+# dropped patches as this has been fixed in the updated runtime files:
+#patch048 -p0
+#patch049 -p0
%patch050 -p0
%patch051 -p0
%patch052 -p0
@@ -367,7 +377,8 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
# Win32:
#patch074 -p0
%patch075 -p0
-%patch076 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch076 -p0
%patch077 -p0
%patch078 -p0
%patch079 -p0
@@ -384,16 +395,16 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch090 -p0
%patch091 -p0
%patch092 -p0
-%patch093 -p0
+# dropped patch as this has been fixed in the updated runtime files:
+#patch093 -p0
%patch094 -p0
%patch095 -p0
%patch096 -p0
%patch097 -p0
%patch098 -p0
%patch099 -p0
+%patch100 -p0
-# Update all runtime files
-%{__tar} xjf %{SOURCE13}
# install spell files
%{__tar} xjf %{SOURCE14}
@@ -773,6 +784,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Tue Sep 12 2006 Karsten Hopp <karsten@redhat.com> 7.0.100-1
+- Patchlevel 100
+- replace runtime files with newer ones
+
* Mon Sep 11 2006 Karsten Hopp <karsten@redhat.de> 7.0.099-1
- Patchlevel 99