From 8ff4f2f51a6cf07fc33742ce3bee81328896e49b Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 25 May 2018 23:29:36 +0000
Subject: Fri May 25 23:29:36 UTC 2018

patches/packages/glibc-zoneinfo-2018e-noarch-2_slack14.1.txz:  Rebuilt.
  Handle removal of US/Pacific-New timezone. If we see that the machine is
  using this, it will be automatically switched to US/Pacific.
---
 patches/source/vim/patches/7.4.395 | 99 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 patches/source/vim/patches/7.4.395

(limited to 'patches/source/vim/patches/7.4.395')

diff --git a/patches/source/vim/patches/7.4.395 b/patches/source/vim/patches/7.4.395
new file mode 100644
index 000000000..943b44e9e
--- /dev/null
+++ b/patches/source/vim/patches/7.4.395
@@ -0,0 +1,99 @@
+To: vim_dev@googlegroups.com
+Subject: Patch 7.4.395
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.4.395 (after 7.4.355)
+Problem:    C indent is wrong below an if with wrapped condition followed by
+	    curly braces. (Trevor Powell)
+Solution:   Make a copy of tryposBrace.
+Files:	    src/misc1.c, src/testdir/test3.in, src/testdir/test3.ok
+
+
+*** ../vim-7.4.394/src/misc1.c	2014-08-06 12:49:06.711289205 +0200
+--- src/misc1.c	2014-08-06 17:35:45.003165594 +0200
+***************
+*** 6995,7000 ****
+--- 6995,7001 ----
+      char_u	*linecopy;
+      pos_T	*trypos;
+      pos_T	*tryposBrace = NULL;
++     pos_T	tryposBraceCopy;
+      pos_T	our_paren_pos;
+      char_u	*start;
+      int		start_brace;
+***************
+*** 7532,7538 ****
+--- 7533,7543 ----
+  	/*
+  	 * We are inside braces, there is a { before this line at the position
+  	 * stored in tryposBrace.
++ 	 * Make a copy of tryposBrace, it may point to pos_copy inside
++ 	 * find_start_brace(), which may be changed somewhere.
+  	 */
++ 	tryposBraceCopy = *tryposBrace;
++ 	tryposBrace = &tryposBraceCopy;
+  	trypos = tryposBrace;
+  	ourscope = trypos->lnum;
+  	start = ml_get(ourscope);
+*** ../vim-7.4.394/src/testdir/test3.in	2014-07-03 22:57:51.299862927 +0200
+--- src/testdir/test3.in	2014-08-06 17:19:41.099172522 +0200
+***************
+*** 464,469 ****
+--- 464,477 ----
+  	asdfasdf
+  }
+  
++ {
++ for ( int i = 0;
++ 	i < 10; i++ )
++ {
++ }
++ 	i = 0;
++ }
++ 
+  class bob
+  {
+  	int foo() {return 1;}
+*** ../vim-7.4.394/src/testdir/test3.ok	2014-07-03 22:57:51.299862927 +0200
+--- src/testdir/test3.ok	2014-08-06 17:20:11.867172301 +0200
+***************
+*** 452,457 ****
+--- 452,465 ----
+  	asdfasdf
+  }
+  
++ {
++ 	for ( int i = 0;
++ 			i < 10; i++ )
++ 	{
++ 	}
++ 	i = 0;
++ }
++ 
+  class bob
+  {
+  	int foo() {return 1;}
+*** ../vim-7.4.394/src/version.c	2014-08-06 16:49:51.203185387 +0200
+--- src/version.c	2014-08-06 17:43:44.243162150 +0200
+***************
+*** 743,744 ****
+--- 743,746 ----
+  {   /* Add new patch number below this line */
++ /**/
++     395,
+  /**/
+
+-- 
+An operatingsystem is just a name you give to the rest of bloating
+idiosyncratic machine-based-features you left out of your editor.
+			(author unknown)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\  an exciting new programming language -- http://www.Zimbu.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
-- 
cgit v1.2.3