diff --git a/7.0.158 b/7.0.158
new file mode 100644
index 0000000..68c8382
--- /dev/null
+++ b/7.0.158
@@ -0,0 +1,50 @@
+To: vim-dev@vim.org
+Subject: Patch 7.0.158
+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.158
+Problem: In a C file with ":set foldmethod=syntax", typing {<CR> on the
+ last line results in the cursor being in a closed fold. (Gautam
+ Iyer)
+Solution: Open fold after inserting a new line.
+Files: src/edit.c
+
+
+*** ../vim-7.0.157/src/edit.c Tue Oct 17 13:39:36 2006
+--- src/edit.c Wed Nov 1 21:17:19 2006
+***************
+*** 9204,9209 ****
+--- 9204,9213 ----
+ #ifdef FEAT_CINDENT
+ can_cindent = TRUE;
+ #endif
++ #ifdef FEAT_FOLDING
++ /* When inserting a line the cursor line must never be in a closed fold. */
++ foldOpenCursor();
++ #endif
+
+ return (!i);
+ }
+*** ../vim-7.0.157/src/version.c Wed Nov 1 18:33:43 2006
+--- src/version.c Wed Nov 1 21:21:22 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 158,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+142. You dream about creating the world's greatest web site.
+
+ /// 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 fed8dc2..b3bee18 100644
--- a/README.patches
+++ b/README.patches
@@ -22,6 +22,11 @@ patches for binaries.
Checksums for the patch files can be found in the file MD5.
+Collection of patches for Vim 7.0:
+ SIZE NAME INCLUDES
+ 98331 7.0.001-100.gz patches 7.0.001 to 7.0.100, gzip'ed
+
+
Individual patches for Vim 7.0:
SIZE NAME FIXES
@@ -164,3 +169,22 @@ Individual patches for Vim 7.0:
2746 7.0.137 configure check for big features is wrong
12174 7.0.138 (extra) Mac: modifiers keys don't work with function keys
2044 7.0.139 undo info missing when using CTRL-PageUp in Insert mode
+ 2235 7.0.140 (after 7.0.134) comparing list/dict with itself is inefficient
+ 6513 7.0.141 extra CR when pasting with the mouse on the command line
+ 2075 7.0.142 middle mouse button didn't work right in Select mode
+ 1531 7.0.143 setting 'scroll' to its default value didn't work correctly
+ 5584 7.0.144 pattern matching may do wrong pointer computations
+ 1463 7.0.145 (after 7.0.142) compiler warning
+ 4308 7.0.146 opening file for quickfix may ignore windows already open
+ 8181 7.0.147 session file can be wrong when there are multiple tab pages
+ 1710 7.0.148 no error message for ":call d.foo()" when "foo" doesn't exist
+ 5277 7.0.149 when resizing windows scrolling is not done in the best way
+ 2416 7.0.150 when resizing the Vim window scrollbinding doesn't work
+ 1932 7.0.151 button order in GTK file dialog is different from Gnome rules
+ 2279 7.0.152 crash when using lesstif 2
+ 4356 7.0.153 crash with cscope when temp file can't be opened
+ 1727 7.0.154 when 'foldnextmax' is negative Vim could hang
+ 5872 7.0.155 when getchar() returns a mouse button the position is unknown
+ 21499 7.0.156 (extra) Vim doesn't compile on Amiga OS4
+ 3594 7.0.157 profiling info was bogus for a recursively called function
+ 1485 7.0.158 cursor in closed fold after adding new line
diff --git a/vim.spec b/vim.spec
index 4c59acd..e660951 100644
--- a/vim.spec
+++ b/vim.spec
@@ -16,7 +16,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim70%{?beta}
-%define patchlevel 139
+%define patchlevel 158
Summary: The VIM editor.
Name: vim
@@ -190,6 +190,25 @@ Patch136: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.136
Patch137: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.137
Patch138: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.138
Patch139: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.139
+Patch140: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.140
+Patch141: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.141
+Patch142: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.142
+Patch143: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.143
+Patch144: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.144
+Patch145: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.145
+Patch146: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.146
+Patch147: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.147
+Patch148: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.148
+Patch149: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.149
+Patch150: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.150
+Patch151: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.151
+Patch152: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.152
+Patch153: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.153
+Patch154: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.154
+Patch155: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.155
+Patch156: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.156
+Patch157: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.157
+Patch158: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.158
Patch3000: vim-7.0-syntax.patch
@@ -491,6 +510,26 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
# Mac:
#patch138 -p0
%patch139 -p0
+%patch140 -p0
+%patch141 -p0
+%patch142 -p0
+%patch143 -p0
+%patch144 -p0
+%patch145 -p0
+%patch146 -p0
+%patch147 -p0
+%patch148 -p0
+%patch149 -p0
+%patch150 -p0
+%patch151 -p0
+%patch152 -p0
+%patch153 -p0
+%patch154 -p0
+%patch155 -p0
+# Amiga:
+#patch156 -p0
+%patch157 -p0
+%patch158 -p0
# install spell files
%if %{withvimspell}
@@ -879,6 +918,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Mon Nov 06 2006 Karsten Hopp <karsten@redhat.com> 7.0.158-1
+- patchlevel 158
+
* Tue Oct 17 2006 Karsten Hopp <karsten@redhat.com> 7.0.139-1
- patchlevel 139
- provide vim, vi (#210950)