From 981387b7c83026c1446cdddf6b374f63973a2b86 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 30 Sep 2017 16:06:13 +0200
Subject: ci/appveyor: modify compression options for cache

Attempt to workaround #7317 by using a different compression algorithm.
---
 appveyor.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
index ecea6c5fa3..2d6135c7a2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,6 @@
 version: '{build}'
+environment:
+  APPVEYOR_CACHE_ENTRY_ZIP_ARGS: "-t7z -m0=lzma -mx=9"
 configuration:
 - MINGW_64
 - MINGW_32
-- 
cgit 


From 2b133101cf67b523c2503ef715dfb9ebfa732da2 Mon Sep 17 00:00:00 2001
From: Ignas Anikevicius <anikevicius@gmail.com>
Date: Mon, 18 Sep 2017 21:06:55 +0300
Subject: win: vim_FullName(): force backslashes #7287

- Replace obvious cases of '/' literal with PATHSEP. (There are still
  some remaining cases that need closer inspection.)
- Fixup tests: ui/screen_basic

closes #7117
ref https://github.com/neovim/neovim/issues/2471#issuecomment-271193714
---
 src/nvim/path.c                          | 10 ++++--
 test/functional/core/path_spec.lua       | 61 ++++++++++++++++++++++++++++++++
 test/functional/ui/screen_basic_spec.lua | 10 +++++-
 test/unit/path_spec.lua                  | 14 ++++++++
 4 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 test/functional/core/path_spec.lua

diff --git a/src/nvim/path.c b/src/nvim/path.c
index f2339c8046..51adcfb135 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1690,6 +1690,9 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force)
 
   if (strlen(fname) > (len - 1)) {
     xstrlcpy(buf, fname, len);  // truncate
+#ifdef WIN32
+    slash_adjust(buf);
+#endif
     return FAIL;
   }
 
@@ -1702,6 +1705,9 @@ int vim_FullName(const char *fname, char *buf, size_t len, bool force)
   if (rv == FAIL) {
     xstrlcpy(buf, fname, len);  // something failed; use the filename
   }
+#ifdef WIN32
+  slash_adjust(buf);
+#endif
   return rv;
 }
 
@@ -2196,11 +2202,11 @@ static int path_get_absolute_path(const char_u *fname, char_u *buf,
 
   // expand it if forced or not an absolute path
   if (force || !path_is_absolute_path(fname)) {
-    if ((p = vim_strrchr(fname, '/')) != NULL) {
+    if ((p = vim_strrchr(fname, PATHSEP)) != NULL) {
       // relative to root
       if (p == fname) {
         // only one path component
-        relative_directory[0] = '/';
+        relative_directory[0] = PATHSEP;
         relative_directory[1] = NUL;
       } else {
         assert(p >= fname);
diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
new file mode 100644
index 0000000000..44e69fff7b
--- /dev/null
+++ b/test/functional/core/path_spec.lua
@@ -0,0 +1,61 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear = helpers.clear
+local eq = helpers.eq
+local eval = helpers.eval
+local get_pathsep = helpers.get_pathsep
+local command = helpers.command
+
+describe("'%:p' expanding", function()
+  local pathsep
+  local targetdir
+  local expected_path
+
+  local function get_full_path()
+    return eval('expand("%:p")')
+  end
+
+  local function join_path(...)
+    return table.concat({...}, pathsep)
+  end
+
+  before_each(function()
+    clear()
+    pathsep = get_pathsep()
+    targetdir = join_path('test', 'functional', 'fixtures')
+    clear(join_path(targetdir, 'tty-test.c'))
+    expected_path = get_full_path()
+  end)
+
+  it('given a relative path with current directory in the middle #7117', function()
+    clear(join_path(targetdir, '.', 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a relative path with current directory #7117', function()
+    clear(join_path('.', targetdir, 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a relative path with current directory to a file when changing directory #7117', function()
+    clear(join_path('.', targetdir, 'tty-test.c'))
+    command('cd test')
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a relative path with directory up the tree to a file #7117', function()
+    clear(join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a different starting directory and a relative path with directory up the tree #7117', function()
+    command('cd test')
+    command('e ' .. join_path('..', targetdir, 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+
+  it('given a different starting directory and a relative path with current directory and up the tree #7117', function()
+    command('cd test')
+    command('e ' .. join_path('.', '..', targetdir, 'tty-test.c'))
+    eq(expected_path, get_full_path())
+  end)
+end)
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index bfcdc7f652..9032239b31 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -5,6 +5,7 @@ local feed, command = helpers.feed, helpers.command
 local insert = helpers.insert
 local eq = helpers.eq
 local eval = helpers.eval
+local iswin = helpers.iswin
 
 describe('screen', function()
   local screen
@@ -120,8 +121,15 @@ describe('Screen', function()
 
     it('has correct default title with named file', function()
       local expected = 'myfile (/mydir) - NVIM'
+      if iswin() then
+        expected = 'myfile (C:\\mydir) - NVIM'
+      end
       command('set title')
-      command('file /mydir/myfile')
+      if iswin() then
+        command('file C:\\mydir\\myfile')
+      else
+        command('file /mydir/myfile')
+      end
       screen:expect(function()
         eq(expected, screen.title)
       end)
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index a9cba7df84..0400747e72 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -481,6 +481,20 @@ describe('path.c', function()
       eq('/tmp', ffi.string(buffer))
       eq(OK, result)
     end)
+
+    itp('works with a relative path with the current directory prefix #7117', function()
+      local force_expansion = 1
+      local result = vim_FullName('./unit-test-directory/test.file', buffer, length, force_expansion)
+      eq(OK, result)
+      eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
+    end)
+
+    itp('works with a relative path with the directory name mentioned twice #7117', function()
+      local force_expansion = 1
+      local result = vim_FullName('unit-test-directory/../unit-test-directory/test.file', buffer, length, force_expansion)
+      eq(OK, result)
+      eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
+    end)
   end)
 
   describe('path_fix_case', function()
-- 
cgit 


From e9dba214eada40a2d64b89616f1799b87cab1e5e Mon Sep 17 00:00:00 2001
From: Ignas Anikevicius <anikevicius@gmail.com>
Date: Thu, 21 Sep 2017 16:50:56 +0300
Subject: test/shada: fixup for Windows backslashes #7287

---
 test/functional/shada/compatibility_spec.lua |  29 +++--
 test/functional/shada/merging_spec.lua       | 187 ++++++++++++++-------------
 2 files changed, 115 insertions(+), 101 deletions(-)

diff --git a/test/functional/shada/compatibility_spec.lua b/test/functional/shada/compatibility_spec.lua
index 1287ac010c..a5ef60d91f 100644
--- a/test/functional/shada/compatibility_spec.lua
+++ b/test/functional/shada/compatibility_spec.lua
@@ -10,6 +10,13 @@ local read_shada_file = shada_helpers.read_shada_file
 
 local wshada, sdrcmd, shada_fname = get_shada_rw('Xtest-functional-shada-compatibility.shada')
 
+local mock_file_path = '/a/b/'
+local mock_file_path2 = '/d/e/'
+if helpers.iswin() then
+  mock_file_path = 'C:/a/'
+  mock_file_path2 = 'C:/d/'
+end
+
 describe('ShaDa forward compatibility support code', function()
   before_each(reset)
   after_each(function()
@@ -114,14 +121,14 @@ describe('ShaDa forward compatibility support code', function()
     funcs.garbagecollect(1)
   end)
 
-  for _, v in ipairs({{name='global mark', mpack='\007\001\018\131\162mX\195\161f\196\006/a/b/c\161nA'},
-                      {name='jump', mpack='\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'},
-                      {name='local mark', mpack='\010\001\018\131\162mX\195\161f\196\006/a/b/c\161na'},
-                      {name='change', mpack='\011\001\015\130\162mX\195\161f\196\006/a/b/c'},
+  for _, v in ipairs({{name='global mark', mpack='\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161nA'},
+                      {name='jump', mpack='\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'},
+                      {name='local mark', mpack='\010\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161na'},
+                      {name='change', mpack='\011\001\015\130\162mX\195\161f\196\006' .. mock_file_path .. 'c'},
                      }) do
     it('works with ' .. v.name .. ' item with BOOL unknown (mX) key value', function()
-      nvim_command('silent noautocmd edit /a/b/c')
-      eq('/a/b/c', funcs.bufname('%'))
+      nvim_command('silent noautocmd edit ' .. mock_file_path .. 'c')
+      eq('' .. mock_file_path .. 'c', funcs.bufname('%'))
       funcs.setline('.', {'1', '2', '3'})
       wshada(v.mpack)
       eq(0, exc_exec(sdrcmd(true)))
@@ -159,12 +166,12 @@ describe('ShaDa forward compatibility support code', function()
 
     if v.name == 'global mark' or v.name == 'local mark' then
       it('works with ' .. v.name .. ' item with <C-a> name', function()
-        nvim_command('silent noautocmd edit /a/b/c')
-        eq('/a/b/c', funcs.bufname('%'))
+        nvim_command('silent noautocmd edit ' .. mock_file_path .. 'c')
+        eq('' .. mock_file_path .. 'c', funcs.bufname('%'))
         funcs.setline('.', {'1', '2', '3'})
         wshada(v.mpack:gsub('n.$', 'n\001')
                .. v.mpack:gsub('n.$', 'n\002')
-               .. v.mpack:gsub('n.$', 'n\003'):gsub('/a/b/c', '/d/e/f'))
+               .. v.mpack:gsub('n.$', 'n\003'):gsub('' .. mock_file_path .. 'c', '' .. mock_file_path2 .. 'f'))
         eq(0, exc_exec(sdrcmd(true)))
         nvim_command('wshada ' .. shada_fname)
         local found = 0
@@ -307,10 +314,10 @@ describe('ShaDa forward compatibility support code', function()
 
   it('works with buffer list item with BOOL unknown (bX) key', function()
     nvim_command('set shada+=%')
-    wshada('\009\000\016\145\130\161f\196\006/a/b/c\162bX\195')
+    wshada('\009\000\016\145\130\161f\196\006' .. mock_file_path .. 'c\162bX\195')
     eq(0, exc_exec(sdrcmd()))
     eq(2, funcs.bufnr('$'))
-    eq('/a/b/c', funcs.bufname(2))
+    eq('' .. mock_file_path .. 'c', funcs.bufname(2))
     os.remove(shada_fname)
     nvim_command('wshada ' .. shada_fname)
     local found = false
diff --git a/test/functional/shada/merging_spec.lua b/test/functional/shada/merging_spec.lua
index 25c73b99eb..7a15c8908b 100644
--- a/test/functional/shada/merging_spec.lua
+++ b/test/functional/shada/merging_spec.lua
@@ -13,6 +13,11 @@ local read_shada_file = shada_helpers.read_shada_file
 local wshada, sdrcmd, shada_fname =
   get_shada_rw('Xtest-functional-shada-merging.shada')
 
+local mock_file_path = '/a/b/'
+if helpers.iswin() then
+  mock_file_path = 'C:/a/'
+end
+
 describe('ShaDa history merging code', function()
   before_each(reset)
   after_each(function()
@@ -512,9 +517,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from instance when reading',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\000\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\000\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -522,9 +527,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from file when reading with !',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\000\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\000\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd(true)))
     nvim_command('normal! `A')
     eq('?', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -532,9 +537,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with eq timestamp from instance when reading',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -542,9 +547,9 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from file when reading',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\002\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\002\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `A')
     eq('?', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
@@ -552,15 +557,15 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from instance when writing',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\000\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\000\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '/a/b/-' then
+      if v.type == 7 and v.value.f == '' .. mock_file_path .. '-' then
         found = found + 1
       end
     end
@@ -569,15 +574,15 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with eq timestamp from instance when writing',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '/a/b/-' then
+      if v.type == 7 and v.value.f == mock_file_path .. '-' then
         found = found + 1
       end
     end
@@ -586,15 +591,15 @@ describe('ShaDa marks support code', function()
 
   it('uses last A mark with gt timestamp from file when writing',
   function()
-    wshada('\007\001\018\131\162mX\195\161f\196\006/a/b/-\161nA')
+    wshada('\007\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. '-\161nA')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\007\002\018\131\162mX\195\161f\196\006/a/b/?\161nA')
+    wshada('\007\002\018\131\162mX\195\161f\196\006' .. mock_file_path .. '?\161nA')
     nvim_command('normal! `A')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 7 and v.value.f == '/a/b/?' then
+      if v.type == 7 and v.value.f == '' .. mock_file_path .. '?' then
         found = found + 1
       end
     end
@@ -603,11 +608,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from instance when reading',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\000\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\000\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
@@ -615,11 +620,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from file when reading with !',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\000\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\000\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd(true)))
     nvim_command('normal! `a')
     eq('?', funcs.getline('.'))
@@ -627,11 +632,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with eq timestamp from instance when reading',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\001\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
@@ -639,11 +644,11 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from file when reading',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\002\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\002\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
     nvim_command('normal! `a')
     eq('?', funcs.getline('.'))
@@ -651,17 +656,17 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from instance when writing',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\000\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\000\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 10 and v.value.f == '/a/b/-' and v.value.n == ('a'):byte() then
+      if v.type == 10 and v.value.f == '' .. mock_file_path .. '-' and v.value.n == ('a'):byte() then
         eq(true, v.value.l == 1 or v.value.l == nil)
         found = found + 1
       end
@@ -671,17 +676,17 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with eq timestamp from instance when writing',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\001\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     nvim_command('normal! `a')
     eq('-', funcs.getline('.'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 10 and v.value.f == '/a/b/-' and v.value.n == ('a'):byte() then
+      if v.type == 10 and v.value.f == '' .. mock_file_path .. '-' and v.value.n == ('a'):byte() then
         eq(true, v.value.l == 1 or v.value.l == nil)
         found = found + 1
       end
@@ -691,17 +696,17 @@ describe('ShaDa marks support code', function()
 
   it('uses last a mark with gt timestamp from file when writing',
   function()
-    nvim_command('edit /a/b/-')
+    nvim_command('edit ' .. mock_file_path .. '-')
     funcs.setline(1, {'-', '?'})
-    wshada('\010\001\017\131\161l\001\161f\196\006/a/b/-\161na')
+    wshada('\010\001\017\131\161l\001\161f\196\006' .. mock_file_path .. '-\161na')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\010\002\017\131\161l\002\161f\196\006/a/b/-\161na')
+    wshada('\010\002\017\131\161l\002\161f\196\006' .. mock_file_path .. '-\161na')
     nvim_command('normal! `a')
     eq('-', funcs.fnamemodify(curbufmeths.get_name(), ':t'))
     eq(0, exc_exec('wshada ' .. shada_fname))
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 10 and v.value.f == '/a/b/-' and v.value.n == ('a'):byte() then
+      if v.type == 10 and v.value.f == '' .. mock_file_path .. '-' and v.value.n == ('a'):byte() then
         eq(2, v.value.l)
         found = found + 1
       end
@@ -813,41 +818,41 @@ describe('ShaDa jumps support code', function()
   end)
 
   it('merges jumps when reading', function()
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\002'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/e\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\002'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'e\161l\002')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\003'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/f\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\003'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'f\161l\002')
     eq(0, exc_exec(sdrcmd()))
     eq('', curbufmeths.get_name())
     eq('\n'
        .. ' jump line  col file/text\n'
-       .. '   6     2    0 /a/b/c\n'
-       .. '   5     2    0 /a/b/d\n'
-       .. '   4     3    0 /a/b/d\n'
-       .. '   3     2    0 /a/b/e\n'
-       .. '   2     2    0 /a/b/f\n'
+       .. '   6     2    0 ' .. mock_file_path .. 'c\n'
+       .. '   5     2    0 ' .. mock_file_path .. 'd\n'
+       .. '   4     3    0 ' .. mock_file_path .. 'd\n'
+       .. '   3     2    0 ' .. mock_file_path .. 'e\n'
+       .. '   2     2    0 ' .. mock_file_path .. 'f\n'
        .. '   1     1    0 \n'
        .. '>', redir_exec('jumps'))
   end)
 
   it('merges jumps when writing', function()
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\002'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/e\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\002'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'e\161l\002')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\008\001\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\008\004\018\131\162mX\195\161f\196\006/a/b/d\161l\003'
-           .. '\008\007\018\131\162mX\195\161f\196\006/a/b/f\161l\002')
+    wshada('\008\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\008\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'd\161l\003'
+           .. '\008\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'f\161l\002')
     eq(0, exc_exec('wshada ' .. shada_fname))
     local jumps = {
-      {file='/a/b/c', line=2},
-      {file='/a/b/d', line=2},
-      {file='/a/b/d', line=3},
-      {file='/a/b/e', line=2},
-      {file='/a/b/f', line=2},
+      {file='' .. mock_file_path .. 'c', line=2},
+      {file='' .. mock_file_path .. 'd', line=2},
+      {file='' .. mock_file_path .. 'd', line=3},
+      {file='' .. mock_file_path .. 'e', line=2},
+      {file='' .. mock_file_path .. 'f', line=2},
     }
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
@@ -864,9 +869,9 @@ describe('ShaDa jumps support code', function()
     local jumps = {}
     local shada = ''
     for i = 1,100 do
-      shada = shada .. ('\008%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
+      shada = shada .. ('\008%c\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l%c'
                        ):format(i, i)
-      jumps[i] = {file='/a/b/c', line=i}
+      jumps[i] = {file='' .. mock_file_path .. 'c', line=i}
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
@@ -874,9 +879,9 @@ describe('ShaDa jumps support code', function()
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
-          '\008\204%c\019\131\162mX\195\161f\196\006/a/b/c\161l\204%c'
+          '\008\204%c\019\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\204%c'
           ):format(t, t)
-      jumps[(t > #jumps + 1) and (#jumps + 1) or t] = {file='/a/b/c', line=t}
+      jumps[(t > #jumps + 1) and (#jumps + 1) or t] = {file='' .. mock_file_path .. 'c', line=t}
     end
     wshada(shada)
     eq(0, exc_exec('wshada ' .. shada_fname))
@@ -904,15 +909,15 @@ describe('ShaDa changes support code', function()
   end)
 
   it('merges changes when reading', function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(7))')
-    wshada('\011\001\018\131\162mX\195\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\011\007\018\131\162mX\195\161f\196\006/a/b/c\161l\003')
+    wshada('\011\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\011\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\003')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\011\001\018\131\162mX\194\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\005'
-           .. '\011\008\018\131\162mX\195\161f\196\006/a/b/c\161l\004')
+    wshada('\011\001\018\131\162mX\194\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\005'
+           .. '\011\008\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\004')
     eq(0, exc_exec(sdrcmd()))
     eq('\n'
        .. 'change line  col text\n'
@@ -925,15 +930,15 @@ describe('ShaDa changes support code', function()
   end)
 
   it('merges changes when writing', function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(7))')
-    wshada('\011\001\018\131\162mX\195\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\002'
-           .. '\011\007\018\131\162mX\195\161f\196\006/a/b/c\161l\003')
+    wshada('\011\001\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\002'
+           .. '\011\007\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\003')
     eq(0, exc_exec(sdrcmd()))
-    wshada('\011\001\018\131\162mX\194\161f\196\006/a/b/c\161l\001'
-           .. '\011\004\018\131\162mX\195\161f\196\006/a/b/c\161l\005'
-           .. '\011\008\018\131\162mX\195\161f\196\006/a/b/c\161l\004')
+    wshada('\011\001\018\131\162mX\194\161f\196\006' .. mock_file_path .. 'c\161l\001'
+           .. '\011\004\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\005'
+           .. '\011\008\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\004')
     eq(0, exc_exec('wshada ' .. shada_fname))
     local changes = {
       {line=1},
@@ -944,7 +949,7 @@ describe('ShaDa changes support code', function()
     }
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 11 and v.value.f == '/a/b/c' then
+      if v.type == 11 and v.value.f == '' .. mock_file_path .. 'c' then
         found = found + 1
         eq(changes[found].line, v.value.l or 1)
       end
@@ -953,12 +958,12 @@ describe('ShaDa changes support code', function()
   end)
 
   it('merges JUMPLISTSIZE changes when writing', function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(202))')
     local changes = {}
     local shada = ''
     for i = 1,100 do
-      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
+      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l%c'
                        ):format(i, i)
       changes[i] = {line=i}
     end
@@ -968,7 +973,7 @@ describe('ShaDa changes support code', function()
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
-          '\011\204%c\019\131\162mX\195\161f\196\006/a/b/c\161l\204%c'
+          '\011\204%c\019\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\204%c'
           ):format(t, t)
       changes[(t > #changes + 1) and (#changes + 1) or t] = {line=t}
     end
@@ -980,7 +985,7 @@ describe('ShaDa changes support code', function()
     end
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 11 and v.value.f == '/a/b/c' then
+      if v.type == 11 and v.value.f == '' .. mock_file_path .. 'c' then
         found = found + 1
         eq(changes[found].line, v.value.l)
       end
@@ -990,20 +995,20 @@ describe('ShaDa changes support code', function()
 
   it('merges JUMPLISTSIZE changes when writing, with new items between old',
   function()
-    nvim_command('edit /a/b/c')
+    nvim_command('edit ' .. mock_file_path .. 'c')
     nvim_command('keepjumps call setline(1, range(202))')
     local shada = ''
     for i = 1,101 do
       local t = i * 2
       shada = shada .. (
-          '\011\204%c\019\131\162mX\195\161f\196\006/a/b/c\161l\204%c'
+          '\011\204%c\019\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l\204%c'
           ):format(t, t)
     end
     wshada(shada)
     eq(0, exc_exec(sdrcmd()))
     shada = ''
     for i = 1,100 do
-      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006/a/b/c\161l%c'
+      shada = shada .. ('\011%c\018\131\162mX\195\161f\196\006' .. mock_file_path .. 'c\161l%c'
                        ):format(i, i)
     end
     local changes = {}
@@ -1022,7 +1027,7 @@ describe('ShaDa changes support code', function()
     end
     local found = 0
     for _, v in ipairs(read_shada_file(shada_fname)) do
-      if v.type == 11 and v.value.f == '/a/b/c' then
+      if v.type == 11 and v.value.f == '' .. mock_file_path .. 'c' then
         found = found + 1
         eq(changes[found].line, v.value.l)
       end
@@ -1030,3 +1035,5 @@ describe('ShaDa changes support code', function()
     eq(found, 100)
   end)
 end)
+
+-- vim: ts=2 sw=2
-- 
cgit 


From 6f7754dfa0c6a9ec2a1e7db3685ffd41b207b882 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 2 Oct 2017 00:24:19 +0200
Subject: test: avoid extra clear() calls

also: various other cleanup
---
 test/functional/core/path_spec.lua       | 53 +++++++++++++++-----------------
 test/functional/ui/screen_basic_spec.lua | 12 ++------
 test/unit/path_spec.lua                  |  4 +--
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/test/functional/core/path_spec.lua b/test/functional/core/path_spec.lua
index 44e69fff7b..669bc99136 100644
--- a/test/functional/core/path_spec.lua
+++ b/test/functional/core/path_spec.lua
@@ -2,60 +2,55 @@ local helpers = require('test.functional.helpers')(after_each)
 local clear = helpers.clear
 local eq = helpers.eq
 local eval = helpers.eval
-local get_pathsep = helpers.get_pathsep
 local command = helpers.command
+local iswin = helpers.iswin
 
-describe("'%:p' expanding", function()
-  local pathsep
+describe('path collapse', function()
   local targetdir
   local expected_path
 
-  local function get_full_path()
-    return eval('expand("%:p")')
-  end
-
   local function join_path(...)
+    local pathsep = (iswin() and '\\' or '/')
     return table.concat({...}, pathsep)
   end
 
   before_each(function()
-    clear()
-    pathsep = get_pathsep()
     targetdir = join_path('test', 'functional', 'fixtures')
-    clear(join_path(targetdir, 'tty-test.c'))
-    expected_path = get_full_path()
+    clear()
+    command('edit '..join_path(targetdir, 'tty-test.c'))
+    expected_path = eval('expand("%:p")')
   end)
 
-  it('given a relative path with current directory in the middle #7117', function()
-    clear(join_path(targetdir, '.', 'tty-test.c'))
-    eq(expected_path, get_full_path())
+  it('with /./ segment #7117', function()
+    command('edit '..join_path(targetdir, '.', 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a relative path with current directory #7117', function()
-    clear(join_path('.', targetdir, 'tty-test.c'))
-    eq(expected_path, get_full_path())
+  it('with ./ prefix #7117', function()
+    command('edit '..join_path('.', targetdir, 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a relative path with current directory to a file when changing directory #7117', function()
-    clear(join_path('.', targetdir, 'tty-test.c'))
+  it('with ./ prefix, after directory change #7117', function()
+    command('edit '..join_path('.', targetdir, 'tty-test.c'))
     command('cd test')
-    eq(expected_path, get_full_path())
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a relative path with directory up the tree to a file #7117', function()
-    clear(join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
-    eq(expected_path, get_full_path())
+  it('with /../ segment #7117', function()
+    command('edit '..join_path(targetdir, '..', 'fixtures', 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a different starting directory and a relative path with directory up the tree #7117', function()
+  it('with ../ and different starting directory #7117', function()
     command('cd test')
-    command('e ' .. join_path('..', targetdir, 'tty-test.c'))
-    eq(expected_path, get_full_path())
+    command('edit '..join_path('..', targetdir, 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 
-  it('given a different starting directory and a relative path with current directory and up the tree #7117', function()
+  it('with ./../ and different starting directory #7117', function()
     command('cd test')
-    command('e ' .. join_path('.', '..', targetdir, 'tty-test.c'))
-    eq(expected_path, get_full_path())
+    command('edit '..join_path('.', '..', targetdir, 'tty-test.c'))
+    eq(expected_path, eval('expand("%:p")'))
   end)
 end)
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 9032239b31..b31d9cb32f 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -120,16 +120,10 @@ describe('Screen', function()
     end)
 
     it('has correct default title with named file', function()
-      local expected = 'myfile (/mydir) - NVIM'
-      if iswin() then
-        expected = 'myfile (C:\\mydir) - NVIM'
-      end
+      local expected = (iswin() and 'myfile (C:\\mydir) - NVIM'
+                                 or 'myfile (/mydir) - NVIM')
       command('set title')
-      if iswin() then
-        command('file C:\\mydir\\myfile')
-      else
-        command('file /mydir/myfile')
-      end
+      command(iswin() and 'file C:\\mydir\\myfile' or 'file /mydir/myfile')
       screen:expect(function()
         eq(expected, screen.title)
       end)
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index 0400747e72..befb204d0a 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -482,14 +482,14 @@ describe('path.c', function()
       eq(OK, result)
     end)
 
-    itp('works with a relative path with the current directory prefix #7117', function()
+    itp('expands "./" to the current directory #7117', function()
       local force_expansion = 1
       local result = vim_FullName('./unit-test-directory/test.file', buffer, length, force_expansion)
       eq(OK, result)
       eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
     end)
 
-    itp('works with a relative path with the directory name mentioned twice #7117', function()
+    itp('collapses "foo/../foo" to "foo" #7117', function()
       local force_expansion = 1
       local result = vim_FullName('unit-test-directory/../unit-test-directory/test.file', buffer, length, force_expansion)
       eq(OK, result)
-- 
cgit 


From 235fda5f86d80b1aa7d7cbcb41e3399c556b7455 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 3 Oct 2017 14:53:11 -0400
Subject: Stub ngettext when libintl isn't available

This should have been included in #6547 as part of vim-patch:7.4.2152.

Closes #7352
---
 cmake/FindLibIntl.cmake | 1 +
 src/nvim/gettext.h      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake
index 75926200c1..ab4632cf45 100644
--- a/cmake/FindLibIntl.cmake
+++ b/cmake/FindLibIntl.cmake
@@ -46,6 +46,7 @@ check_c_source_compiles("
 
 int main(int argc, char** argv) {
   gettext(\"foo\");
+  ngettext(\"foo\", \"bar\", 1);
   bindtextdomain(\"foo\", \"bar\");
   bind_textdomain_codeset(\"foo\", \"bar\");
   textdomain(\"foo\");
diff --git a/src/nvim/gettext.h b/src/nvim/gettext.h
index aa0e97233e..60317b8484 100644
--- a/src/nvim/gettext.h
+++ b/src/nvim/gettext.h
@@ -13,6 +13,7 @@
 #else
 # define _(x) ((char *)(x))
 # define N_(x) x
+# define ngettext(x, xs, n) ((n) == 1 ? (x) : (xs))
 # define bindtextdomain(x, y)  // empty
 # define bind_textdomain_codeset(x, y)  // empty
 # define textdomain(x)  // empty
-- 
cgit 


From b7fe15d8f9162888dd2ca944e61e1e12abe84815 Mon Sep 17 00:00:00 2001
From: Jan Edmund Lazo <jan.lazo@mail.utoronto.ca>
Date: Wed, 4 Oct 2017 03:18:03 -0400
Subject: editorconfig: handle Vim help files (#7354)

---
 .editorconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index b08a27f2a2..ac902ecec5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,10 @@ end_of_line = lf
 insert_final_newline = true
 charset = utf_8
 
+[runtime/doc/*.txt]
+indent_style = tab
+indent_size = 8
+
 [Makefile]
 indent_style = tab
 tab_width = 4
-- 
cgit 


From 5f4d2edeeea4d05761811d652dee8067fdbbae2a Mon Sep 17 00:00:00 2001
From: nate <nateozemon@gmail.com>
Date: Sat, 19 Aug 2017 18:33:14 -0700
Subject: 'titleold': set UI title on exit #7191

closes #7129
ref #4063
---
 src/nvim/buffer.c  | 13 ++++++++++---
 src/nvim/globals.h |  1 +
 src/nvim/option.c  |  1 +
 src/nvim/os_unix.c |  7 +++++++
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 724a8578ac..950010b13b 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3069,9 +3069,16 @@ static bool ti_change(char_u *str, char_u **last)
 /// Set current window title
 void resettitle(void)
 {
-  ui_call_set_title(cstr_as_string((char *)lasttitle));
-  ui_call_set_icon(cstr_as_string((char *)lasticon));
-  ui_flush();
+  // if icon change, should the title be reset too?
+  if (p_icon) {
+    ui_call_set_title(cstr_as_string((char *)lasttitle));
+    ui_call_set_icon(cstr_as_string((char *)lasticon));
+  } else if (p_title) {
+    ui_call_set_title(cstr_as_string((char *)lasttitle));
+  }
+  if (p_title || p_icon) {
+    ui_flush();
+  }
 }
 
 # if defined(EXITFREE)
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 300e506854..62bb817c4c 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -279,6 +279,7 @@ EXTERN int need_wait_return INIT(= 0);      /* need to wait for return later */
 EXTERN int did_wait_return INIT(= FALSE);       /* wait_return() was used and
                                                    nothing written since then */
 EXTERN int need_maketitle INIT(= TRUE);      /* call maketitle() soon */
+EXTERN int did_enable_title INIT(= FALSE);   /* did set title */
 
 EXTERN int quit_more INIT(= FALSE);         /* 'q' hit at "--more--" msg */
 #if defined(UNIX) || defined(MACOS_X)
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 13aadb71bb..3a7499f195 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1953,6 +1953,7 @@ did_set_title (
   if (starting != NO_SCREEN) {
     maketitle();
     resettitle();
+    did_enable_title = true;
   }
 }
 
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 692bcc97f4..5855a874c4 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -15,6 +15,7 @@
 #include <string.h>
 
 #include "nvim/api/private/handle.h"
+#include "nvim/api/private/helpers.h"
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/os_unix.h"
@@ -137,6 +138,12 @@ void mch_exit(int r) FUNC_ATTR_NORETURN
 {
   exiting = true;
 
+  if ((p_title
+       || (did_enable_title
+           && (p_titlestring == NULL || STRLEN(p_titlestring) == 0)))
+      && p_titleold != NULL) {
+    ui_call_set_title(cstr_as_string((char *)p_titleold));
+  }
   ui_builtin_stop();
   ui_flush();
   ml_close_all(true);           // remove all memfiles
-- 
cgit 


From 70e84a7c4c7bfad9b3a0ec18fd219f51205c03f8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 5 Oct 2017 09:14:18 +0200
Subject: 'titleold': simplify behavior

- default 'titleold' to empty
- set title on exit if 'title' is enabled and 'titleold' is non-empty
- update docs
---
 runtime/doc/options.txt | 13 ++++++-------
 src/nvim/buffer.c       |  5 +----
 src/nvim/globals.h      |  1 -
 src/nvim/option.c       |  1 -
 src/nvim/options.lua    |  2 +-
 src/nvim/os_unix.c      |  5 +----
 6 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c6965648ef..462fda4bfd 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6267,11 +6267,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 	when part of a command has been typed.
 
 						*'title'* *'notitle'*
-'title'			boolean	(default off, on when title can be restored)
+'title'			boolean	(default off)
 			global
 	When on, the title of the window will be set to the value of
 	'titlestring' (if it is not empty), or to:
-		filename [+=-] (path) - VIM
+		filename [+=-] (path) - NVIM
 	Where:
 		filename	the name of the file being edited
 		-		indicates the file cannot be modified, 'ma' off
@@ -6279,7 +6279,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 		=		indicates the file is read-only
 		=+		indicates the file is read-only and modified
 		(path)		is the path of the file being edited
-		- VIM		the server name |v:servername| or "VIM"
+		- NVIM		the server name |v:servername| or "NVIM"
 
 								*'titlelen'*
 'titlelen'		number	(default 85)
@@ -6295,11 +6295,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	'titlelen' is also used for the 'titlestring' option.
 
 						*'titleold'*
-'titleold'		string	(default "Thanks for flying Vim")
+'titleold'		string	(default "")
 			global
-	This option will be used for the window title when exiting Vim if the
-	original title cannot be restored.  Only happens if 'title' is on or
-	'titlestring' is not empty.
+	If not empty, this option will be used to set the window title when
+	exiting.  Only if 'title' is enabled.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 						*'titlestring'*
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 950010b13b..fbfb4e02ea 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3069,14 +3069,11 @@ static bool ti_change(char_u *str, char_u **last)
 /// Set current window title
 void resettitle(void)
 {
-  // if icon change, should the title be reset too?
   if (p_icon) {
-    ui_call_set_title(cstr_as_string((char *)lasttitle));
     ui_call_set_icon(cstr_as_string((char *)lasticon));
-  } else if (p_title) {
-    ui_call_set_title(cstr_as_string((char *)lasttitle));
   }
   if (p_title || p_icon) {
+    ui_call_set_title(cstr_as_string((char *)lasttitle));
     ui_flush();
   }
 }
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 62bb817c4c..300e506854 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -279,7 +279,6 @@ EXTERN int need_wait_return INIT(= 0);      /* need to wait for return later */
 EXTERN int did_wait_return INIT(= FALSE);       /* wait_return() was used and
                                                    nothing written since then */
 EXTERN int need_maketitle INIT(= TRUE);      /* call maketitle() soon */
-EXTERN int did_enable_title INIT(= FALSE);   /* did set title */
 
 EXTERN int quit_more INIT(= FALSE);         /* 'q' hit at "--more--" msg */
 #if defined(UNIX) || defined(MACOS_X)
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 3a7499f195..13aadb71bb 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1953,7 +1953,6 @@ did_set_title (
   if (starting != NO_SCREEN) {
     maketitle();
     resettitle();
-    did_enable_title = true;
   }
 }
 
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 103227f6b5..84ccb2e28d 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2498,7 +2498,7 @@ return {
       no_mkrc=true,
       vi_def=true,
       varname='p_titleold',
-      defaults={if_true={vi=N_("Thanks for flying Vim")}}
+      defaults={if_true={vi=N_("")}}
     },
     {
       full_name='titlestring',
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 5855a874c4..2748de7329 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -138,10 +138,7 @@ void mch_exit(int r) FUNC_ATTR_NORETURN
 {
   exiting = true;
 
-  if ((p_title
-       || (did_enable_title
-           && (p_titlestring == NULL || STRLEN(p_titlestring) == 0)))
-      && p_titleold != NULL) {
+  if (p_title && *p_titleold != NUL) {
     ui_call_set_title(cstr_as_string((char *)p_titleold));
   }
   ui_builtin_stop();
-- 
cgit 


From 73b50de925c10aaf0db2ffed47ec8459b0730cd1 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 5 Oct 2017 09:49:17 +0200
Subject: 'titleold': move logic to getout()

---
 src/nvim/main.c    | 5 +++++
 src/nvim/os_unix.c | 4 ----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/nvim/main.c b/src/nvim/main.c
index 024c56dd05..ea7a58bda3 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -649,6 +649,11 @@ void getout(int exitval)
   /* Position the cursor again, the autocommands may have moved it */
   ui_cursor_goto((int)Rows - 1, 0);
 
+  // Apply 'titleold'.
+  if (p_title && *p_titleold != NUL) {
+    ui_call_set_title(cstr_as_string((char *)p_titleold));
+  }
+
 #if defined(USE_ICONV) && defined(DYNAMIC_ICONV)
   iconv_end();
 #endif
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index 2748de7329..692bcc97f4 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -15,7 +15,6 @@
 #include <string.h>
 
 #include "nvim/api/private/handle.h"
-#include "nvim/api/private/helpers.h"
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/os_unix.h"
@@ -138,9 +137,6 @@ void mch_exit(int r) FUNC_ATTR_NORETURN
 {
   exiting = true;
 
-  if (p_title && *p_titleold != NUL) {
-    ui_call_set_title(cstr_as_string((char *)p_titleold));
-  }
   ui_builtin_stop();
   ui_flush();
   ml_close_all(true);           // remove all memfiles
-- 
cgit