diff --git a/.gitignore b/.gitignore index 1cbb5c5c..2074a873 100644 --- a/.gitignore +++ b/.gitignore @@ -334,3 +334,5 @@ /vim-8.2-2018.tar.bz2 /vim-8.2-2072.tar.bz2 /vim-8.2-2086.tar.bz2 +/vim-8.2-2108.tar.bz2 +/vim-8.2-2115.tar.bz2 diff --git a/sources b/sources index 9524ee89..d6a37b39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vim-8.2-2086.tar.bz2) = 16dfa2404dbe39bd4139cf7947b22dc4c17327f15a33e08ef2bc1d019c54640c88b8519cc964744475db7b46abccab85f723e36a361de185436d5f4351535e95 +SHA512 (vim-8.2-2115.tar.bz2) = 7fcf4a0f55b70280f8251cf1c0e46d5cbd0a4e5cb98df0f36600defffc8e0f641c23f6f88f3124fad29aa6c3f6cc7f0e3950af0403b14e1f5691203e879c1564 diff --git a/vim.sh b/vim.sh index e257ad11..58c33000 100644 --- a/vim.sh +++ b/vim.sh @@ -8,7 +8,11 @@ if [ -n "${BASH_VERSION-}" -o -n "${KSH_VERSION-}" -o -n "${ZSH_VERSION-}" ]; th ;; -/usr/bin/vi) # apply only if founded vi is in expected dir from distro - alias vim="read -rep $'No vim found, using vi, press ENTER to continue\n' -n1 -t 20 -s && vi" + if [ -n "${ZSH_VERSION-}" ]; then + alias vim="read -t 10 -s -k 1 '?No vim found, using vi, press ENTER to continue...' && echo '' && vi" + else + alias vim="read -rep $'No vim found, using vi, press ENTER to continue...\n' -n1 -t 10 -s && vi" + fi ;; esac fi diff --git a/vim.spec b/vim.spec index 1da22f38..e133e7ca 100644 --- a/vim.spec +++ b/vim.spec @@ -1,4 +1,4 @@ -%define patchlevel 2086 +%define patchlevel 2115 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %define WITH_SELINUX 1 %endif @@ -826,6 +826,15 @@ touch %{buildroot}/%{_datadir}/%{name}/vimfiles/doc/tags %config(noreplace) %{_sysconfdir}/profile.d/vim-default-editor.* %changelog +* Wed Dec 09 2020 Zdenek Dohnal - 2:8.2.2115-1 +- patchlevel 2115 + +* Wed Dec 09 2020 Zdenek Dohnal - 2:8.2.2108-2 +- 1902772 - "vim" from vim-minimal defunct on zsh + +* Tue Dec 08 2020 Zdenek Dohnal - 2:8.2.2108-1 +- patchlevel 2108 + * Fri Dec 04 2020 Zdenek Dohnal - 2:8.2.2086-1 - patchlevel 2086