Mercurial > vim
changeset 8958:12392eb2923a v7.4.1765
commit https://github.com/vim/vim/commit/4694a17d1ec08382f996990a7fac1ac60197ec81
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Apr 21 14:05:23 2016 +0200
patch 7.4.1765
Problem: Undo options are not together in the options window.
Solution: Put them together. (Gary Johnson)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 21 Apr 2016 14:15:06 +0200 |
| parents | 8ef5306300e5 |
| children | d355b5a83753 |
| files | runtime/optwin.vim src/os_unix.c src/version.c |
| diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/optwin.vim +++ b/runtime/optwin.vim @@ -738,6 +738,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") @@ -1074,10 +1078,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")
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -5138,7 +5138,8 @@ mch_start_job(char **argv, job_T *job, j if (pid == 0) { - int null_fd = -1; + int null_fd = -1; + int stderr_works = TRUE; /* child */ reset_signals(); /* handle signals normally */ @@ -5175,6 +5176,7 @@ mch_start_job(char **argv, job_T *job, j { close(2); ignored = dup(null_fd); + stderr_works = FALSE; } else if (use_out_for_err) { @@ -5210,7 +5212,8 @@ mch_start_job(char **argv, job_T *job, j /* See above for type of argv. */ execvp(argv[0], argv); - // perror("executing job failed"); + if (stderr_works) + perror("executing job failed"); _exit(EXEC_FAILED); /* exec failed, return failure code */ }