diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-04-21 14:05:23 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-04-21 14:05:23 +0200 |
| commit | 4694a17d1ec08382f996990a7fac1ac60197ec81 (patch) | |
| tree | 6010c9cfe992d5c0b6e5879d47d98c7e7b301936 | |
| parent | ba53435144f46eaaa53c63a62e748b3feee9742c (diff) | |
patch 7.4.1765v7.4.1765
Problem: Undo options are not together in the options window.
Solution: Put them together. (Gary Johnson)
| -rw-r--r-- | runtime/optwin.vim | 8 | ||||
| -rw-r--r-- | src/os_unix.c | 7 | ||||
| -rw-r--r-- | src/version.c | 4 |
3 files changed, 13 insertions, 6 deletions
diff --git a/runtime/optwin.vim b/runtime/optwin.vim index 368eb09dd6..b88f3017c1 100644 --- 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") diff --git a/src/os_unix.c b/src/os_unix.c index f8cf691d1f..57eb050660 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5138,7 +5138,8 @@ mch_start_job(char **argv, job_T *job, jobopt_T *options UNUSED) 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, jobopt_T *options UNUSED) { 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, jobopt_T *options UNUSED) /* 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 */ } diff --git a/src/version.c b/src/version.c index 9ec96b2cc1..75d4746920 100644 --- a/src/version.c +++ b/src/version.c @@ -749,6 +749,10 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1765, +/**/ + 1764, +/**/ 1763, /**/ 1762, |