aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.1765

Browse Source 
Problem:    Undo options are not together in the options window.
Solution:   Put them together.  (Gary Johnson)
This commit is contained in:
Bram Moolenaar
2016-04-21 14:05:23 +02:00
parent ba53435144
commit 4694a17d1e
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/optwin.vim
View File

@@ -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")

7
src/os_unix.c
View File

@@ -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 */
}

4
src/version.c
View File

@@ -748,6 +748,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1765,
/**/
1764,
/**/
1763,
/**/