diff options
| author | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-10-04 23:15:16 +0900 |
|---|---|---|
| committer | Shougo Matsushita <Shougo.Matsu@gmail.com> | 2016-10-04 23:18:24 +0900 |
| commit | fdb0a5e24eb7fab77ae0d206a00c07b48414a481 (patch) | |
| tree | 6f9102d796d5c54b56bacfe3d74930399f696707 | |
| parent | c3990ba0e6fdc24bda029d55cd74ce00eda85b10 (diff) | |
| download | rneovim-fdb0a5e24eb7fab77ae0d206a00c07b48414a481.tar.gz rneovim-fdb0a5e24eb7fab77ae0d206a00c07b48414a481.tar.bz2 rneovim-fdb0a5e24eb7fab77ae0d206a00c07b48414a481.zip | |
vim-patch:7.4.1765
Problem: Undo options are not together in the options window.
Solution: Put them together. (Gary Johnson)
https://github.com/vim/vim/commit/4694a17d1ec08382f996990a7fac1ac60197ec81
| -rw-r--r-- | runtime/optwin.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 890c183a5a..2ad87d1062 100644 --- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -710,6 +710,10 @@ call <SID>Header("editing text") call append("$", "undolevels\tmaximum number of changes that can be undone") call append("$", "\t(global or local to buffer)") call append("$", " \tset ul=" . &ul) +call append("$", "undofile\tautomatically save and restore undo history") +call <SID>BinOptionG("udf", &udf) +call append("$", "undodir\tlist of directories for undo files") +call <SID>OptionG("udir", &udir) call append("$", "undoreload\tmaximum number lines to save for undo on a buffer reload") call append("$", " \tset ur=" . &ur) call append("$", "modified\tchanges have been made and not written to a file") @@ -1032,10 +1036,6 @@ if has("vertsplit") call append("$", "cmdwinheight\theight of the command-line window") call <SID>OptionG("cwh", &cwh) endif -call append("$", "undofile\tautomatically save and restore undo history") -call <SID>BinOptionG("udf", &udf) -call append("$", "undodir\tlist of directories for undo files") -call <SID>OptionG("udir", &udir) call <SID>Header("executing external commands") diff --git a/src/nvim/version.c b/src/nvim/version.c index 23cac97615..a81d8f89c5 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -677,7 +677,7 @@ static int included_patches[] = { // 1768, // 1767 NA // 1766 NA - // 1765, + 1765, // 1764 NA // 1763, // 1762, |