Patch 8.2.1768

7 views
Skip to first unread message

Bram Moolenaar

unread,
Sep 28, 2020, 3:42:43 PM9/28/20
to vim...@googlegroups.com

Patch 8.2.1768
Problem: Cannot use the help menu from a terminal window.
Solution: Add ":tlnoremenu" commands. (Yee Cheng Chin, closes #7023)
Files: runtime/menu.vim, src/testdir/test_gui.vim


*** ../vim-8.2.1767/runtime/menu.vim 2020-03-29 20:08:41.147942551 +0200
--- runtime/menu.vim 2020-09-28 21:40:15.976265053 +0200
***************
*** 2,8 ****
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <Br...@vim.org>
! " Last Change: 2020 Mar 29

" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
--- 2,8 ----
" You can also use this as a start for your own set of menus.
"
" Maintainer: Bram Moolenaar <Br...@vim.org>
! " Last Change: 2020 Sep 28

" Note that ":an" (short for ":anoremenu") is often used to make a menu work
" in all modes and avoid side effects from mappings defined by the user.
***************
*** 89,94 ****
--- 89,109 ----
an 9999.80 &Help.&Version :version<CR>
an 9999.90 &Help.&About :intro<CR>

+ if exists(':tlmenu')
+ tlnoremenu 9999.10 &Help.&Overview<Tab><F1> <C-W>:help<CR>
+ tlnoremenu 9999.20 &Help.&User\ Manual <C-W>:help usr_toc<CR>
+ tlnoremenu 9999.30 &Help.&How-To\ Links <C-W>:help how-to<CR>
+ tlnoremenu <silent> 9999.40 &Help.&Find\.\.\. <C-W>:call <SID>Helpfind()<CR>
+ tlnoremenu 9999.45 &Help.-sep1- <Nop>
+ tlnoremenu 9999.50 &Help.&Credits <C-W>:help credits<CR>
+ tlnoremenu 9999.60 &Help.Co&pying <C-W>:help copying<CR>
+ tlnoremenu 9999.70 &Help.&Sponsor/Register <C-W>:help sponsor<CR>
+ tlnoremenu 9999.70 &Help.O&rphans <C-W>:help kcc<CR>
+ tlnoremenu 9999.75 &Help.-sep2- <Nop>
+ tlnoremenu 9999.80 &Help.&Version <C-W>:version<CR>
+ tlnoremenu 9999.90 &Help.&About <C-W>:intro<CR>
+ endif
+
fun! s:Helpfind()
if !exists("g:menutrans_help_dialog")
let g:menutrans_help_dialog = "Enter a command or word to find help on:\n\nPrepend i_ for Input mode commands (e.g.: i_CTRL-X)\nPrepend c_ for command-line editing commands (e.g.: c_<Del>)\nPrepend ' for an option name (e.g.: 'shiftwidth')"
***************
*** 453,464 ****
an 40.335.260 &Tools.&Spelling.Set\ Language\ to\ "en_us" :set spl=en_us spell<CR>
an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages :call <SID>SpellLang()<CR>

! let s:undo_spellang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
func s:SpellLang()
! for cmd in s:undo_spellang
exe "silent! " . cmd
endfor
! let s:undo_spellang = []

if &enc == "iso-8859-15"
let enc = "latin1"
--- 468,479 ----
an 40.335.260 &Tools.&Spelling.Set\ Language\ to\ "en_us" :set spl=en_us spell<CR>
an <silent> 40.335.270 &Tools.&Spelling.&Find\ More\ Languages :call <SID>SpellLang()<CR>

! let s:undo_spelllang = ['aun &Tools.&Spelling.&Find\ More\ Languages']
func s:SpellLang()
! for cmd in s:undo_spelllang
exe "silent! " . cmd
endfor
! let s:undo_spelllang = []

if &enc == "iso-8859-15"
let enc = "latin1"
***************
*** 481,487 ****
let found += 1
let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
! let s:undo_spellang += ['aun ' . menuname]
endif
let n += 10
endfor
--- 496,502 ----
let found += 1
let menuname = '&Tools.&Spelling.' . escape(g:menutrans_set_lang_to, "\\. \t|") . '\ "' . nm . '"'
exe 'an 40.335.' . n . ' ' . menuname . ' :set spl=' . nm . ' spell<CR>'
! let s:undo_spelllang += ['aun ' . menuname]
endif
let n += 10
endfor
*** ../vim-8.2.1767/src/testdir/test_gui.vim 2020-09-04 21:18:40.484161926 +0200
--- src/testdir/test_gui.vim 2020-09-28 21:37:45.188926705 +0200
***************
*** 739,744 ****
--- 739,747 ----

" Check deleting menu doesn't cause trouble.
aunmenu Help
+ if exists(':tlmenu')
+ tlunmenu Help
+ endif
call assert_fails('menu Help', 'E329:')
endfunc

*** ../vim-8.2.1767/src/version.c 2020-09-27 23:33:56.241527069 +0200
--- src/version.c 2020-09-28 21:39:14.560529173 +0200
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 1768,
/**/

--
hundred-and-one symptoms of being an internet addict:
11. You find yourself typing "com" after every period when using a word
processor.com

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Reply all
Reply to author
Forward
0 new messages