From b0675d2f636fa2aa58cbecf26aa4494925ffe68751575ce411bff24a147e2b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Tue, 24 Nov 2020 17:49:03 +0000 Subject: [PATCH 1/2] Accepting request 850581 from home:lnussel:usrmove - prepare usrmerge (boo#1029961) OBS-URL: https://build.opensuse.org/request/show/850581 OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=637 --- vim.changes | 5 +++++ vim.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/vim.changes b/vim.changes index 459f96c..3ea2b3c 100644 --- a/vim.changes +++ b/vim.changes @@ -161,6 +161,11 @@ Sun Oct 25 11:44:15 UTC 2020 - Ondřej Súkup * Crash in out-of-memory situation. * Vim9: command modifiers do not work. +------------------------------------------------------------------- +Fri Oct 16 10:25:42 UTC 2020 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + ------------------------------------------------------------------- Tue Oct 13 06:21:33 UTC 2020 - Ondřej Súkup diff --git a/vim.spec b/vim.spec index 6321703..cb2609a 100644 --- a/vim.spec +++ b/vim.spec @@ -312,11 +312,15 @@ ln -s -f %{_sysconfdir}/alternatives/vi %{buildroot}%{_bindir}/vi # compat symlinks mkdir %{buildroot}/bin +%if !0%{?usrmerged} ln -s -f %{_bindir}/vim %{buildroot}/bin/vi ln -s -f %{_bindir}/vim %{buildroot}/bin/vim +%endif ln -s -f vim %{buildroot}%{_bindir}/vi ln -s -f vim %{buildroot}%{_bindir}/edit +%if !0%{?usrmerged} ln -s -f %{_bindir}/vim %{buildroot}/bin/ex +%endif # man pages ln -s -f vim.1.gz %{buildroot}%{_mandir}/man1/vi.1.gz @@ -460,9 +464,11 @@ fi %{_bindir}/vim-nox11 %{_bindir}/vim # symlinks +%if !0%{?usrmerged} /bin/vi /bin/vim /bin/ex +%endif %{_bindir}/edit %{_bindir}/ex %{_bindir}/rview From 1b66eac537c37ea96278af1c964ee823398db41047c6c6986a532cd7526bc35c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 25 Nov 2020 09:53:48 +0000 Subject: [PATCH 2/2] - Updated to version 8.2.2039, fixes the following problems * Cannot backspace in prompt buffer after using cursor-left. (Maxim Kim) * Vim9: error for using a string in a condition is confusing. * Making a mapping work in all modes is complicated. * "term_opencmd" option of term_start() is truncated. (Sergey Vlasov) * Vim9: some tests are not done at the script level. * MinGW: parallel compilation might fail. * Quickfix window not updated when adding invalid entries. * ml_get error when using to open a terminal. * Cannot use :vimgrep in omni completion, causing C completion to fail. * Crash when closing terminal popup with mapping. * Expression test is flaky on Appveyor. * Still in Insert mode when opening terminal popup with a mapping in Insert mode. * Info popup triggers WinEnter and WinLeave autocommands. * Cursor position wrong in terminal popup with finished job. * Coverity warns for not using the ga_grow() return value. * Build fails with small features. * Occasional failure of the netbeans test. * The popup menu can cause too much redrawing. * Vim9: invalid error for argument of extend(). * Window changes when using bufload() while in a terminal popup. * Terminal Cmd test sometimes fails to close popup. * Terminal popup test sometimes fails. * Vim9: dict.key assignment not implemented yet. * Vim9: :def function does not apply 'maxfuncdepth'. * Vim9: lambda argument shadowed by function name. * Build error with +conceal but without +popupwin. * Compiler warning for uninitialized variable. * Redoing a mapping with doesn't work properly. OBS-URL: https://build.opensuse.org/package/show/editors/vim?expand=0&rev=638 --- vim-8.2.1975.tar.gz | 3 --- vim-8.2.2039.tar.gz | 3 +++ vim.changes | 65 +++++++++++++++++++++++++++++++++++++++++++++ vim.spec | 2 +- 4 files changed, 69 insertions(+), 4 deletions(-) delete mode 100644 vim-8.2.1975.tar.gz create mode 100644 vim-8.2.2039.tar.gz diff --git a/vim-8.2.1975.tar.gz b/vim-8.2.1975.tar.gz deleted file mode 100644 index 75030a1..0000000 --- a/vim-8.2.1975.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c031b3df1a853ef73de8d9ff49333c4144bbccb2061cc1a29014e441ec6c803 -size 15224984 diff --git a/vim-8.2.2039.tar.gz b/vim-8.2.2039.tar.gz new file mode 100644 index 0000000..119346c --- /dev/null +++ b/vim-8.2.2039.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3827f4c3f2cfe841e22b6e6fd7922ae709c8732ee78483eaf173f5a99db99e20 +size 15236788 diff --git a/vim.changes b/vim.changes index 3ea2b3c..1825014 100644 --- a/vim.changes +++ b/vim.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Wed Nov 25 09:50:56 UTC 2020 - Ondřej Súkup + +- Updated to version 8.2.2039, fixes the following problems + * Cannot backspace in prompt buffer after using cursor-left. (Maxim Kim) + * Vim9: error for using a string in a condition is confusing. + * Making a mapping work in all modes is complicated. + * "term_opencmd" option of term_start() is truncated. (Sergey Vlasov) + * Vim9: some tests are not done at the script level. + * MinGW: parallel compilation might fail. + * Quickfix window not updated when adding invalid entries. + * ml_get error when using to open a terminal. + * Cannot use :vimgrep in omni completion, causing C completion to fail. + * Crash when closing terminal popup with mapping. + * Expression test is flaky on Appveyor. + * Still in Insert mode when opening terminal popup with a mapping + in Insert mode. + * Info popup triggers WinEnter and WinLeave autocommands. + * Cursor position wrong in terminal popup with finished job. + * Coverity warns for not using the ga_grow() return value. + * Build fails with small features. + * Occasional failure of the netbeans test. + * The popup menu can cause too much redrawing. + * Vim9: invalid error for argument of extend(). + * Window changes when using bufload() while in a terminal popup. + * Terminal Cmd test sometimes fails to close popup. + * Terminal popup test sometimes fails. + * Vim9: dict.key assignment not implemented yet. + * Vim9: :def function does not apply 'maxfuncdepth'. + * Vim9: lambda argument shadowed by function name. + * Build error with +conceal but without +popupwin. + * Compiler warning for uninitialized variable. + * Redoing a mapping with doesn't work properly. + * .pbtxt files are not recognized. + * Test for insert mode in popup is not reliable. + * Vim9: compiling fails for unreachable return statement. + * "syn sync" reports a very large number. + * Vim9: confusing error message when using bool wrongly. + * Vim9: not skipping white space after unary minus. + * Using CTRL-O in a prompt buffer moves cursor to start of the line. + * Vim9: literal dict #{} is not like any other language. + * Swap file test is a little flaky. + * Missing part of the dict change. + * Vim9: script variable not found from lambda. + * Swap file test fails on MS-Windows. + * Some compilers do not like the "namespace" argument. + * Vim9: get E1099 when autocommand resets did_emsg. + * Vim9: star command recognized errornously. + * Vim: memory leak when :execute fails. + * Flicker when redrawing a popup with a title and border. + * Amiga: Not all colors are used on OS4. + * Coverity warns for possibly using not NUL terminated string. + * Coverity warns for uninitialized field. + * Coverity warns for using an uninitialized variable. + * Coverity warns for not checking return value. + * Some tests fail on Mac. + * Some tests fail when run under valgrind. + * Cabalconfig and cabalproject filetypes not recognized. + * Vim9: :def without argument gives compilation error. + * Vim9: list unpack in for statement not compiled yet. + * Current buffer is messed up if creating a new buffer for the quickfix + window fails. + * Compiler test depends on list of compiler plugins. + * Viminfo is not written when creating a new file. + ------------------------------------------------------------------- Thu Nov 12 06:41:20 UTC 2020 - Wang Jun diff --git a/vim.spec b/vim.spec index cb2609a..7d70c9d 100644 --- a/vim.spec +++ b/vim.spec @@ -17,7 +17,7 @@ %define pkg_version 8.2 -%define patchlevel 1975 +%define patchlevel 2039 %define patchlevel_compact %{patchlevel} %define VIM_SUBDIR vim82 %define site_runtimepath %{_datadir}/vim/site