From d6e5f94ae945308d96be414c9c1fb3f0ae71355e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 24 Mar 2017 02:54:50 +0100
Subject: win: defaults: 'shellredir', 'shellxquote', 'shellxescape'

---
 src/nvim/options.lua | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'src/nvim/options.lua')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 4ca63f2efe..774c39808f 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2051,7 +2051,11 @@ return {
       secure=true,
       vi_def=true,
       varname='p_srr',
-      defaults={if_true={vi=">"}}
+      defaults={
+        condition='WIN32',
+        if_true={vi=">%s 2>&1"},
+        if_false={vi=">"}
+      }
     },
     {
       full_name='shellslash', abbreviation='ssl',
@@ -2073,7 +2077,11 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxq',
-      defaults={if_true={vi=""}}
+      defaults={
+        condition='WIN32',
+        if_true={vi="("},
+        if_false={vi=""}
+      }
     },
     {
       full_name='shellxescape', abbreviation='sxe',
@@ -2081,7 +2089,11 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxe',
-      defaults={if_true={vi=""}}
+      defaults={
+        condition='WIN32',
+        if_true={vi='"&|<>()@^'},
+        if_false={vi=""}
+      }
     },
     {
       full_name='shiftround', abbreviation='sr',
-- 
cgit 


From d31d177a0c2c9997c2cdb04975bc3354b9a23fb8 Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <rap-ep@gmx.com>
Date: Thu, 30 Mar 2017 23:41:52 +0100
Subject: win: default shellxescape, shellxquote to empty

Calling cmd.exe in Windows follows a very different pattern from Vim.
The primary difference is that Vim does a nested call to cmd.exe, e.g.
the following call in Vim

    system('echo a 2>&1')

spawns the following processes

    "C:\Program Files (x86)\Vim\vim80\vimrun" -s C:\Windows\system32\cmd.exe /c (echo a 2^>^&1
        ^>C:\Users\dummy\AppData\Local\Temp\VIoC169.tmp 2^>^&1)
    C:\Windows\system32\cmd.exe /c C:\Windows\system32\cmd.exe /c (echo a 2^>^&1
        ^>C:\Users\dummy\AppData\Local\Temp\VIo3C6C.tmp 2^>^&1)
    C:\Windows\system32\cmd.exe  /c (echo a 2>&1
        >C:\Users\dummy\AppData\Local\Temp\VIo3C6C.tmp 2>&1)

The escaping with ^ is needed because cmd.exe calls itself and needs to
preserve the special metacharacters for the last call. However in nvim
no nested call is made, system('') spawns a single cmd.exe process.
Setting shellxescape to "" disables escaping with ^.

The previous default for shellxquote=( wrapped any command in
parenthesis, in Vim this is more meaningful due to the use of tempfiles
to store the output and redirection (also see &shellquote). There is
a slight benefit in having the default be empty because some expressions
that run in console will not run within parens e.g. due to unbalanced
double quotes

    system('echo "a b')
---
 src/nvim/options.lua | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'src/nvim/options.lua')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 774c39808f..4e7be63b63 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2077,11 +2077,7 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxq',
-      defaults={
-        condition='WIN32',
-        if_true={vi="("},
-        if_false={vi=""}
-      }
+      defaults={if_true={vi=""}}
     },
     {
       full_name='shellxescape', abbreviation='sxe',
@@ -2089,11 +2085,7 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxe',
-      defaults={
-        condition='WIN32',
-        if_true={vi='"&|<>()@^'},
-        if_false={vi=""}
-      }
+      defaults={if_true={vi=""}}
     },
     {
       full_name='shiftround', abbreviation='sr',
-- 
cgit 


From d349f610ac9010cecb550c33fbab632b4e7946ca Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 26 Apr 2017 01:43:03 +0200
Subject: 'guicursor': No color/blink by default

Closes #6577
---
 src/nvim/options.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nvim/options.lua')

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 4e7be63b63..ba7bf5bafb 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1000,7 +1000,7 @@ return {
       deny_duplicates=true,
       vi_def=true,
       varname='p_guicursor',
-      defaults={if_true={vi="n-v-c:block-Cursor/lCursor,ve:ver35-Cursor,o:hor50-Cursor,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor,sm:block-Cursor-blinkwait175-blinkoff150-blinkon175"}}
+      defaults={if_true={vi="n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"}}
     },
     {
       full_name='guifont', abbreviation='gfn',
-- 
cgit