From 7bc37ffb22a84668bba5b2e3589c4c05ad43f7d0 Mon Sep 17 00:00:00 2001
From: Jakob Schnitzer <mail@jakobschnitzer.de>
Date: Fri, 24 Mar 2017 20:21:05 +0100
Subject: terminal: global 'scrollback' #6352

Make the 'scrollback' option work like most other buffer-local options:
- `:set scrollback=x` sets the global and local value
- `:setglobal scrollback=x` sets only the global default
- new terminal buffers inherit the global

Normal buffers are still always -1, and :setlocal there is an error.

Closes #6337
---
 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 853c2b52d7..ee2b8a563d 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1918,7 +1918,7 @@ return {
       vi_def=true,
       varname='p_scbk',
       redraw={'current_buffer'},
-      defaults={if_true={vi=-1}}
+      defaults={if_true={vi=1000}}
     },
     {
       full_name='scrollbind', abbreviation='scb',
-- 
cgit 


From 53da57d27a8ee47fe42604ad07bb7c956d9012f5 Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 22 Mar 2017 12:24:07 +0800
Subject: vim-patch:7.4.2236

Problem:    The 'langnoremap' option leads to double negatives.  And it does
            not work for the last character of a mapping.
Solution:   Add 'langremap' with the opposite value.  Keep 'langnoremap' for
            backwards compatibility.  Make it work for the last character of a
            mapping.  Make the test work.

https://github.com/vim/vim/commit/920694c1b60fac8017b8909efcc24f189804a9bb
---
 src/nvim/options.lua | 6 ++++++
 1 file changed, 6 insertions(+)

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

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index ee2b8a563d..9dff3410d6 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1346,6 +1346,12 @@ return {
       varname='p_lnr',
       defaults={if_true={vi=false, vim=true}}
     },
+    {
+      full_name='langremap', abbreviation='lrm',
+      type='bool', scope={'global'},
+      varname='p_lrm',
+      defaults={if_true={vi=true, vim=false}}
+    },
     {
       full_name='laststatus', abbreviation='ls',
       type='number', scope={'global'},
-- 
cgit 


From c2826a7830ddba66261afdf45fcf4d0043506342 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 1 Apr 2017 13:08:42 +0200
Subject: 'guicursor': Empty means "block cursor in all modes".

Also: update default 'guicursor' to match the documentation.
---
 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 9dff3410d6..09f016cf5a 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,o:hor50,i-ci:hor15,r-cr:hor30,sm:block"}}
+      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"}}
     },
     {
       full_name='guifont', abbreviation='gfn',
-- 
cgit 


From a7f34e199144bfb657c180cdc1413093fd34bdf9 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 4 Apr 2017 03:38:57 +0200
Subject: options: remove 'guiheadroom'

---
 src/nvim/options.lua | 7 -------
 1 file changed, 7 deletions(-)

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

diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 09f016cf5a..4ca63f2efe 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1025,13 +1025,6 @@ return {
       redraw={'everything'},
       enable_if=false,
     },
-    {
-      full_name='guiheadroom', abbreviation='ghr',
-      type='number', scope={'global'},
-      vi_def=true,
-      enable_if=false,
-      defaults={if_true={vi=50}}
-    },
     {
       full_name='guioptions', abbreviation='go',
       type='string', list='flags', scope={'global'},
-- 
cgit