From 009f5ed8eb6f28e570d176ded06d223e297dabfd Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Dec 12 2016 14:41:14 +0000
Subject: Merge branch 'f23' into f24


---

diff --git a/README.patches b/README.patches
index 915e555..26b40f3 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,79 @@
+commit fe38b494fff56cd9b2fcaeef26a8fd7b6557d69c
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Dec 11 21:34:23 2016 +0100
+
+    patch 8.0.0133
+    Problem:    "2;'(" causes ml_get errors in an empty buffer.  (Dominique Pelle)
+    Solution:   Check the cursor line earlier.
+
+commit 4c8980b717f73042f1d625ee255fa74eddb989ba
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Dec 11 15:24:48 2016 +0100
+
+    patch 8.0.0132
+    Problem:    Test fails because of using :finish.
+    Solution:   Change to return.
+
+commit 73b484c4da00011317dc68ada4f5dfc6515ad263
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Sun Dec 11 15:11:17 2016 +0100
+
+    patch 8.0.0131
+    Problem:    Not enough test coverage for syntax commands.
+    Solution:   Add more tests. (Dominique Pelle)
+
+commit 63de19e805a7df2b52ec0e705b6a668ecd8e1b64
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 9 20:11:26 2016 +0100
+
+    patch 8.0.0130
+    Problem:    Configure uses "ushort" while the Vim code doesn't.
+    Solution:   Use "unsigned short" instead. (Fredrik Fornwall, closes #1314)
+
+commit 0df3c7f2a05c2a99f2fb2747ae46bd6594052997
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 9 19:57:14 2016 +0100
+
+    patch 8.0.0129
+    Problem:    Parallel make still doesn't work. (Lewis Muir)
+    Solution:   Define OBJ_MAIN.
+
+commit 7089237885218eb8a19805bc2b75481c4efcd6ba
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 9 19:51:49 2016 +0100
+
+    patch 8.0.0128
+    Problem:    Display test fails on MS-Windows.
+    Solution:   Set 'isprint' to "@".
+
+commit 73fd4988866c3adc15b5d093efdf5e8cf70d093d
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 9 19:36:56 2016 +0100
+
+    patch 8.0.0127
+    Problem:    Cancelling completion still inserts text when formatting is done
+                for 'textwidth'. (lacygoill)
+    Solution:   Don't format when CTRL-E was typed. (Hirohito Higashi,
+                closes #1312)
+
+commit 6270660611a151c5d0f614a5f0248ccdc80ed971
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 9 19:28:48 2016 +0100
+
+    patch 8.0.0126
+    Problem:    Display problem with 'foldcolumn' and a wide character.
+                (esiegerman)
+    Solution:   Don't use "extra" but an allocated buffer. (Christian Brabandt,
+                closes #1310)
+
+commit eaaa9bbda6ec0a8589a9b23720f95bffe01dc267
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Fri Dec 9 18:42:20 2016 +0100
+
+    patch 8.0.0125
+    Problem:    Not enough testing for entering Ex commands.
+    Solution:   Add test for CTRL-\ e {expr}. (Dominique Pelle)
+
 commit 3421566376b5723213af502bd3c2b9debe025ef1
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Sun Dec 4 13:37:41 2016 +0100
diff --git a/vim.spec b/vim.spec
index 09d0645..2288c15 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 124
+%define patchlevel 133
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -21,7 +21,7 @@ Summary: The VIM editor
 URL:     http://www.vim.org/
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: Vim
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}-%{patchlevel}.tar.bz2
@@ -754,6 +754,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Mon Dec 12 2016 Karsten Hopp <karsten@redhat.com> 8.0.133-1
+- patchlevel 133
+
 * Mon Dec 05 2016 Zdenek Dohnal <zdohnal@redhat.com> - 2:8.0.124-2
 - add new sources