aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1547: undo in the options window makes it empty

Browse Source 
Problem:    Undo in the options window makes it empty.
Solution:   Set 'undolevels' while filling the buffer. (Yasuhiro Matthew,
            closes #2645)
This commit is contained in:
Bram Moolenaar 2018-02-27 17:04:25 +01:00
parent c8bcfe7efd
commit 9c474b2773
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/optwin.vim
View File

@ -1,7 +1,7 @@
" These commands create the option window. " These commands create the option window.
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " Maintainer: Bram Moolenaar <Bram@vim.org>
" Last Change: 2018 Feb 11 " Last Change: 2018 Feb 27
" If there already is an option window, jump to that one. " If there already is an option window, jump to that one.
let buf = bufnr('option-window') let buf = bufnr('option-window')
@ -122,11 +122,13 @@ fun! <SID>Update(lnum, line, local, thiswin)
endfun endfun
" Reset 'title' and 'icon' to make it work faster. " Reset 'title' and 'icon' to make it work faster.
" Reset 'undolevels' to avoid undo'ing until the buffer is empty.
let s:old_title = &title let s:old_title = &title
let s:old_icon = &icon let s:old_icon = &icon
let s:old_sc = &sc let s:old_sc = &sc
let s:old_ru = &ru let s:old_ru = &ru
set notitle noicon nosc noru let s:old_ul = &ul
set notitle noicon nosc noru ul=-1
" If the current window is a help window, try finding a non-help window. " If the current window is a help window, try finding a non-help window.
" Relies on syntax highlighting to be switched on. " Relies on syntax highlighting to be switched on.
@ -756,7 +758,7 @@ call <SID>OptionG("km", &km)
call <SID>Header("editing text") call <SID>Header("editing text")
call append("$", "undolevels\tmaximum number of changes that can be undone") call append("$", "undolevels\tmaximum number of changes that can be undone")
call append("$", "\t(global or local to buffer)") call append("$", "\t(global or local to buffer)")
call append("$", " \tset ul=" . &ul) call append("$", " \tset ul=" . s:old_ul)
call append("$", "undofile\tautomatically save and restore undo history") call append("$", "undofile\tautomatically save and restore undo history")
call <SID>BinOptionG("udf", &udf) call <SID>BinOptionG("udf", &udf)
call append("$", "undodir\tlist of directories for undo files") call append("$", "undodir\tlist of directories for undo files")
@ -1438,6 +1440,7 @@ let &icon = s:old_icon
let &ru = s:old_ru let &ru = s:old_ru
let &sc = s:old_sc let &sc = s:old_sc
let &cpo = s:cpo_save let &cpo = s:cpo_save
unlet s:old_title s:old_icon s:old_ru s:old_sc s:cpo_save s:idx s:lnum let &ul = s:old_ul
unlet s:old_title s:old_icon s:old_ru s:old_sc s:cpo_save s:idx s:lnum s:old_ul
" vim: ts=8 sw=2 sts=2 " vim: ts=8 sw=2 sts=2

2
src/version.c
View File

@ -778,6 +778,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1547,
/**/ /**/
1546, 1546,
/**/ /**/