# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1454527804 -3600
# Node ID 14a5de0990a5f9b4824f3372ae2472027cf26553
# Parent  b9bb340fd94da592eedc0a4ba0271bcd62ff0cbf
commit https://github.com/vim/vim/commit/f92591f7f9fc78d2aced99befe444cb423b26df8
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Feb 3 20:22:32 2016 +0100

    patch 7.4.1248
    Problem:    Can't reliably stop the channel test server.  Can't start the
                server if the python file is not executable.
    Solution:   Use "pkill" instead of "killall".  Run the python file as an
                argument instead of as an executable.

diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
old mode 100755
new mode 100644
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -4,7 +4,8 @@ scriptencoding utf-8
 " This requires the Python command to run the test server.
 " This most likely only works on Unix and Windows console.
 if has('unix')
-  if !executable('python')
+  " We also need the pkill command to make sure the server can be stopped.
+  if !executable('python') || !executable('pkill')
     finish
   endif
 elseif has('win32') && !has('gui_win32')
@@ -20,7 +21,7 @@ func s:start_server()
   if has('win32')
     silent !start cmd /c start "test_channel" py test_channel.py
   else
-    silent !./test_channel.py&
+    silent !python test_channel.py&
   endif
 endfunc
 
@@ -28,7 +29,7 @@ func s:kill_server()
   if has('win32')
     call system('taskkill /IM py.exe /T /F /FI "WINDOWTITLE eq test_channel"')
   else
-    call system("killall test_channel.py")
+    call system("pkill --full test_channel.py")
   endif
 endfunc
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1248,
+/**/
     1247,
 /**/
     1246,