From 2daf0b37dbfe54a4510c1033531dbaefd168c387 Mon Sep 17 00:00:00 2001 From: ii14 <59243201+ii14@users.noreply.github.com> Date: Mon, 13 Mar 2023 03:29:11 +0100 Subject: feat(options)!: deprecate paste, remove pastetoggle (#22647) we cannot remove 'paste'. It is very common in plugins and configs. 'pastetoggle' can and should be removed though, it's a total waste of everyone's time because it generates bug reports and doesn't work well, and is useless because bracketed-paste works better. --- runtime/optwin.vim | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) (limited to 'runtime/optwin.vim') diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 200254321e..0d10ac4758 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -106,11 +106,7 @@ func Update(lnum, line, local, thiswin) else let name = substitute(a:line, '^ \tset \(no\)\=\([a-z]*\).*', '\2', "") endif - if name == "pt" && &pt =~ "\x80" - let val = PTvalue() - else - let val = escape(eval('&' . name), " \t\\\"|") - endif + let val = escape(eval('&' . name), " \t\\\"|") if a:local exe a:thiswin . "wincmd w" endif @@ -211,14 +207,6 @@ func Header(text) let s:lnum = s:lnum + 1 endfunc -" Get the value of 'pastetoggle'. It could be a special key. -func PTvalue() - redir @a - silent set pt - redir END - return substitute(@a, '[^=]*=\(.*\)', '\1', "") -endfunc - " Restore the previous value of 'cpoptions' here, it's used below. let &cpo = s:cpo_save @@ -232,12 +220,6 @@ call AddOption("cpoptions", gettext("list of flags to specify Vi compatibil call OptionG("cpo", &cpo) call AddOption("paste", gettext("paste mode, insert typed text literally")) call BinOptionG("paste", &paste) -call AddOption("pastetoggle", gettext("key sequence to toggle paste mode")) -if &pt =~ "\x80" - call append("$", " \tset pt=" . PTvalue()) -else - call OptionG("pt", &pt) -endif call AddOption("runtimepath", gettext("list of directories used for runtime files and plugins")) call OptionG("rtp", &rtp) call AddOption("packpath", gettext("list of directories used for plugin packages")) -- cgit From be11f80d018797b514ed7d01cde2e4c8f88cc8d2 Mon Sep 17 00:00:00 2001 From: Luuk van Baal Date: Wed, 26 Apr 2023 01:55:00 +0200 Subject: vim-patch:9.0.0640: cannot scroll by screen line if a line wraps Problem: Cannot scroll by screen line if a line wraps. Solution: Add the 'smoothscroll' option. Only works for CTRL-E and CTRL-Y so far. https://github.com/vim/vim/commit/f6196f424474e2a9c160f2a995fc2691f82b58f9 vim-patch:9.0.0641: missing part of the new option code Problem: Missing part of the new option code. Solution: Add missing WV_SMS. https://github.com/vim/vim/commit/bbbda8fd81f6d720962b67ae885825bad9be4456 Co-authored-by: Bram Moolenaar --- runtime/optwin.vim | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime/optwin.vim') diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 0d10ac4758..b7b9c61123 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -305,6 +305,9 @@ call Header(gettext("displaying text")) call AddOption("scroll", gettext("number of lines to scroll for CTRL-U and CTRL-D")) call append("$", "\t" .. s:local_to_window) call OptionL("scr") +call AddOption("smoothscroll", gettext("scroll by screen line")) +call append("$", "\t" .. s:local_to_window) +call BinOptionL("sms") call AddOption("scrolloff", gettext("number of screen lines to show around the cursor")) call append("$", " \tset so=" . &so) call AddOption("wrap", gettext("long lines wrap")) -- cgit From cbf54ec2a5aaa1a00ff89e26bab44a30d09d4631 Mon Sep 17 00:00:00 2001 From: Sean Dewar Date: Sun, 13 Aug 2023 13:25:10 +0100 Subject: vim-patch:e978b4534a5e (#24697) Farewell to Bram and dedicate upcoming Vim 9.1 to him (vim/vim#12749) https://github.com/vim/vim/commit/e978b4534a5e10471108259118c0ef791106fd92 Also update the header for the following files that were converted to Vim9 script upstream: - autoload/ccomplete.lua (vim9jitted) - ftplugin.vim - ftplugof.vim - indent.vim - indent/vim.vim - makemenu.vim This also updates the "Last Change" dates, even if some changes (due to rewrites to Vim9 script) were not ported. There's still a few other places where Bram is still mentioned as a maintainer in the files we and Vim have: - ftplugin/bash.vim - indent/bash.vim - indent/html.vim - indent/mail.vim - macros/accents.vim - macros/editexisting.vim - syntax/bash.vim - syntax/shared/typescriptcommon.vim - syntax/tar.vim - syntax/typescript.vim - syntax/typescriptreact.vim - syntax/zimbu.vim Maybe future patches will address that. Also exclude changes to .po files that didn't apply automatically (the `:messages` maintainer string isn't used in Nvim anyway). Co-authored-by: Christian Brabandt --- runtime/optwin.vim | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'runtime/optwin.vim') diff --git a/runtime/optwin.vim b/runtime/optwin.vim index b7b9c61123..647859e359 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,8 @@ " These commands create the option window. " -" Maintainer: Bram Moolenaar -" Last Change: 2022 Dec 16 +" Maintainer: The Vim Project +" Last Change: 2023 Aug 10 +" Former Maintainer: Bram Moolenaar " If there already is an option window, jump to that one. let buf = bufnr('option-window') -- cgit From 4afd33e69f4c4a061bcb51a5ed437163262f943c Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Thu, 31 Aug 2023 08:22:07 +0200 Subject: vim-patch:0b8b145bf8bf runtime(optwin): Fix for 'splitkeep' option (vim/vim#12974) 'spk' was used as a boolean, rather than a string option. https://github.com/vim/vim/commit/0b8b145bf8bfd3e90a1c30a999e6adb89ec8891c Co-authored-by: xrandomname <141588647+xrandomname@users.noreply.github.com> --- runtime/optwin.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/optwin.vim') diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 647859e359..fc60f70335 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -1,7 +1,7 @@ " These commands create the option window. " " Maintainer: The Vim Project -" Last Change: 2023 Aug 10 +" Last Change: 2023 Aug 31 " Former Maintainer: Bram Moolenaar " If there already is an option window, jump to that one. @@ -480,7 +480,7 @@ call OptionG("swb", &swb) call AddOption("splitbelow", gettext("a new window is put below the current one")) call BinOptionG("sb", &sb) call AddOption("splitkeep", gettext("determines scroll behavior for split windows")) -call BinOptionG("spk", &spk) +call OptionG("spk", &spk) call AddOption("splitright", gettext("a new window is put right of the current one")) call BinOptionG("spr", &spr) call AddOption("scrollbind", gettext("this window scrolls together with other bound windows")) -- cgit