Patch 8.0.1549
Problem:    Various small problems in test files.
Solution:   Include small changes.
Files:      src/testdir/test_channel.py, src/testdir/shared.vim,
            src/testdir/test_gui.vim, src/testdir/test_gui_init.vim


*** ../vim-8.0.1548/src/testdir/test_channel.py 2016-12-03 15:23:36.567060983 
+0100
--- src/testdir/test_channel.py 2017-02-06 20:31:27.510151114 +0100
***************
*** 62,67 ****
--- 62,100 ----
                      if decoded[1] == 'hello!':
                          # simply send back a string
                          response = "got it"
+                     elif decoded[1] == 'malformed1':
+                         cmd = '["ex",":"]wrong!["ex","smi"]'
+                         print("sending: {0}".format(cmd))
+                         self.request.sendall(cmd.encode('utf-8'))
+                         response = "ok"
+                         # Need to wait for Vim to give up, otherwise it
+                         # sometimes fails on OS X.
+                         time.sleep(0.2)
+                     elif decoded[1] == 'malformed2':
+                         cmd = '"unterminated string'
+                         print("sending: {0}".format(cmd))
+                         self.request.sendall(cmd.encode('utf-8'))
+                         response = "ok"
+                         # Need to wait for Vim to give up, otherwise the 
double
+                         # quote in the "ok" response terminates the string.
+                         time.sleep(0.2)
+                     elif decoded[1] == 'malformed3':
+                         cmd = '["ex","missing ]"'
+                         print("sending: {0}".format(cmd))
+                         self.request.sendall(cmd.encode('utf-8'))
+                         response = "ok"
+                         # Need to wait for Vim to give up, otherwise the ]
+                         # in the "ok" response terminates the list.
+                         time.sleep(0.2)
+                     elif decoded[1] == 'split':
+                         cmd = '["ex","let '
+                         print("sending: {0}".format(cmd))
+                         self.request.sendall(cmd.encode('utf-8'))
+                         time.sleep(0.01)
+                         cmd = 'g:split = 123"]'
+                         print("sending: {0}".format(cmd))
+                         self.request.sendall(cmd.encode('utf-8'))
+                         response = "ok"
                      elif decoded[1].startswith("echo "):
                          # send back the argument
                          response = decoded[1][5:]
***************
*** 121,159 ****
                          print("sending: {0}".format(cmd))
                          self.request.sendall(cmd.encode('utf-8'))
                          response = "ok"
-                     elif decoded[1] == 'malformed1':
-                         cmd = '["ex",":"]wrong!["ex","smi"]'
-                         print("sending: {0}".format(cmd))
-                         self.request.sendall(cmd.encode('utf-8'))
-                         response = "ok"
-                         # Need to wait for Vim to give up, otherwise it
-                         # sometimes fails on OS X.
-                         time.sleep(0.2)
-                     elif decoded[1] == 'malformed2':
-                         cmd = '"unterminated string'
-                         print("sending: {0}".format(cmd))
-                         self.request.sendall(cmd.encode('utf-8'))
-                         response = "ok"
-                         # Need to wait for Vim to give up, otherwise the 
double
-                         # quote in the "ok" response terminates the string.
-                         time.sleep(0.2)
-                     elif decoded[1] == 'malformed3':
-                         cmd = '["ex","missing ]"'
-                         print("sending: {0}".format(cmd))
-                         self.request.sendall(cmd.encode('utf-8'))
-                         response = "ok"
-                         # Need to wait for Vim to give up, otherwise the ]
-                         # in the "ok" response terminates the list.
-                         time.sleep(0.2)
-                     elif decoded[1] == 'split':
-                         cmd = '["ex","let '
-                         print("sending: {0}".format(cmd))
-                         self.request.sendall(cmd.encode('utf-8'))
-                         time.sleep(0.01)
-                         cmd = 'g:split = 123"]'
-                         print("sending: {0}".format(cmd))
-                         self.request.sendall(cmd.encode('utf-8'))
-                         response = "ok"
                      elif decoded[1] == 'an expr':
                          # Send an expr request.
                          cmd = '["expr","setline(\\"$\\", 
[\\"one\\",\\"two\\",\\"three\\"])"]'
--- 154,159 ----
*** ../vim-8.0.1548/src/testdir/shared.vim      2018-02-20 15:50:49.300325612 
+0100
--- src/testdir/shared.vim      2018-02-24 17:39:31.265235308 +0100
***************
*** 115,120 ****
--- 115,121 ----
  
  " Wait for up to a second for "expr" to become true.  "expr" can be a
  " stringified expression to evaluate, or a funcref without arguments.
+ " A second argument can be used to specify a different timeout in msec.
  "
  " Return time slept in milliseconds.  With the +reltime feature this can be
  " more than the actual waiting time.  Without +reltime it can also be less.
*** ../vim-8.0.1548/src/testdir/test_gui.vim    2017-08-13 20:26:16.040377374 
+0200
--- src/testdir/test_gui.vim    2017-10-28 14:38:41.240117453 +0200
***************
*** 16,22 ****
  endfunc
  
  " Test for resetting "secure" flag after GUI has started.
! " Must be run first.
  func Test_1_set_secure()
    set exrc secure
    gui -f
--- 16,22 ----
  endfunc
  
  " Test for resetting "secure" flag after GUI has started.
! " Must be run first, since it starts the GUI on Unix.
  func Test_1_set_secure()
    set exrc secure
    gui -f
*** ../vim-8.0.1548/src/testdir/test_gui_init.vim       2017-08-13 
20:26:16.040377374 +0200
--- src/testdir/test_gui_init.vim       2017-08-29 20:40:10.541883563 +0200
***************
*** 17,23 ****
  endfunc
  
  " Ignore the "failed to create input context" error.
! call test_ignore_error('E285')
  
  " Start the GUI now, in the foreground.
  gui -f
--- 17,23 ----
  endfunc
  
  " Ignore the "failed to create input context" error.
! call test_ignore_error('E285:')
  
  " Start the GUI now, in the foreground.
  gui -f
*** ../vim-8.0.1548/src/version.c       2018-02-27 17:07:39.484114283 +0100
--- src/version.c       2018-02-27 17:13:02.337199504 +0100
***************
*** 780,781 ****
--- 780,783 ----
  {   /* Add new patch number below this line */
+ /**/
+     1549,
  /**/

-- 
   [The rest of the ARMY stand around looking at a loss.]
INSPECTOR END OF FILM: (picks up megaphone) All right!  Clear off!  Go on!
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- [email protected] -- 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    ///

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups 
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Raspunde prin e-mail lui