From 81525dc5c35c350c1e7e29c625368263cc8b3e33 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Sat, 28 Jan 2017 14:30:57 +0100 Subject: defaults: Revert 'mouse=a' (#6022) This default causes too much confusion for terminal users. Until a better approach is implemented, revert to the traditional default. Better solution would be: - Implement a right-click menu for TUI - Set 'mouse=a' *only* if clipboard is working. Closes #5938 --- runtime/doc/vim_diff.txt | 1 - src/nvim/options.lua | 2 +- test/functional/clipboard/clipboard_provider_spec.lua | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index ae0bd5a867..20002c1118 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -47,7 +47,6 @@ these differences. - 'langnoremap' is set by default - 'laststatus' defaults to 2 (statusline is always shown) - 'listchars' defaults to "tab:> ,trail:-,nbsp:+" -- 'mouse' defaults to "a" - 'nocompatible' is always set - 'nrformats' defaults to "bin,hex" - 'sessionoptions' doesn't include "options" diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 859658e40d..fd68d1cde0 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1572,7 +1572,7 @@ return { full_name='mouse', type='string', list='flags', scope={'global'}, varname='p_mouse', - defaults={if_true={vi="", vim="a"}} + defaults={if_true={vi="", vim=""}} }, { full_name='mousefocus', abbreviation='mousef', diff --git a/test/functional/clipboard/clipboard_provider_spec.lua b/test/functional/clipboard/clipboard_provider_spec.lua index 15977b9777..2b26697b97 100644 --- a/test/functional/clipboard/clipboard_provider_spec.lua +++ b/test/functional/clipboard/clipboard_provider_spec.lua @@ -438,6 +438,8 @@ describe('clipboard usage', function() end) it('handles middleclick correctly', function() + execute('set mouse=a') + local screen = Screen.new(30, 5) screen:attach() insert([[ -- cgit