diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-08 22:37:24 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-08 22:37:24 +0100 |
| commit | b92abad0c58de36d0b0afdcd4ec05261fa1fa84c (patch) | |
| tree | b30dae4100e009e083158e13f04951b52678718d | |
| parent | cbebd4879cc78e670d79b2c57dc33d7b911c962a (diff) | |
patch 7.4.1291v7.4.1291
Problem: On MS-Windows the channel test server doesn't quit.
Solution: Use return instead of break. (Ken Takata)
| -rw-r--r-- | src/testdir/test_channel.py | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py index 40a2043cc0..039a9de91e 100644 --- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -133,7 +133,7 @@ class ThreadedTCPRequestHandler(socketserver.BaseRequestHandler): elif decoded[1] == '!quit!': # we're done self.server.shutdown() - break + return elif decoded[1] == '!crash!': # Crash! 42 / 0 diff --git a/src/version.c b/src/version.c index 66739aa29d..9b9702aa27 100644 --- a/src/version.c +++ b/src/version.c @@ -748,6 +748,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1291, +/**/ 1290, /**/ 1289, |