From 6e1b46380681c621b486dfbf549dfb070867a8bb Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Sat, 13 Dec 2014 18:00:14 +0100
Subject: [PATCH] - patchlevel 546

---
 README.patches |  4 ++++
 vim.spec       | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.patches b/README.patches
index e75d7bf3..d43b243c 100644
--- a/README.patches
+++ b/README.patches
@@ -564,3 +564,7 @@ Individual patches for Vim 7.4:
   1802  7.4.540  (after 7.4.539) cannot build with tiny and small features
   2795  7.4.541  crash when doing a range assign
  28576  7.4.542  cannot specify the type of range for a user command
+  4114  7.4.543  (after 7.4.232) "1,3s/\n//" joins two lines instead of three
+  1655  7.4.544  warnings for unused arguments with a combination of features
+  1983  7.4.545  highlighting for multi-line matches is not correct
+  4044  7.4.546  repeated use of vim_snprintf() with a number
diff --git a/vim.spec b/vim.spec
index da7dcf0c..63ca8a85 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 542
+%define patchlevel 546
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -589,6 +589,10 @@ Patch539: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.539
 Patch540: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.540
 Patch541: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.541
 Patch542: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.542
+Patch543: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.543
+Patch544: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.544
+Patch545: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.545
+Patch546: ftp://ftp.vim.org/pub/vim/patches/7.4/7.4.546
 
 Patch3000: vim-7.4-syntax.patch
 Patch3002: vim-7.1-nowarnings.patch
@@ -1278,6 +1282,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
 %patch540 -p0
 %patch541 -p0
 %patch542 -p0
+%patch543 -p0
+%patch544 -p0
+%patch545 -p0
+%patch546 -p0
 
 # install spell files
 %if %{withvimspell}
@@ -1795,6 +1803,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Sat Dec 13 2014 Karsten Hopp <karsten@redhat.com> 7.4.546-1
+- patchlevel 546
+
 * Mon Dec 08 2014 Karsten Hopp <karsten@redhat.com> 7.4.542-1
 - patchlevel 542