diff --git a/runtime/doc/news.txt b/runtime/doc/news.txt index 5c93128f25..4db9188f90 100644 --- a/runtime/doc/news.txt +++ b/runtime/doc/news.txt @@ -269,6 +269,10 @@ These existing features changed their behavior. • |vim.on_key()| callbacks won't be invoked recursively when a callback itself consumes input. +• "q" in man pages now uses |CTRL-W_q| instead of |CTRL-W_c| to close the + current window, and it no longer throws |E444| when there is only one window + on the screen. Global variable `vim.g.pager` is removed. + ============================================================================== REMOVED FEATURES *news-removed* diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 37667477f3..5ea36c32ce 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -26,11 +26,7 @@ if !exists('g:no_plugin_maps') && !exists('g:no_man_maps') nnoremap k gk nnoremap gO :lua require'man'.show_toc() nnoremap <2-LeftMouse> :Man - if get(g:, 'pager') - nnoremap q :lcloseq - else - nnoremap q :lclosec - endif + nnoremap q :lcloseq endif if get(g:, 'ft_man_folding_enable', 0) diff --git a/runtime/lua/man.lua b/runtime/lua/man.lua index fce8f89be8..6f60bf1cef 100644 --- a/runtime/lua/man.lua +++ b/runtime/lua/man.lua @@ -675,7 +675,6 @@ function M.init_pager() vim.cmd.file({ 'man://' .. fn.fnameescape(ref):lower(), mods = { silent = true } }) end - vim.g.pager = true set_options() end