patch 7.4.1765

Problem:    Undo options are not together in the options window.
Solution:   Put them together.  (Gary Johnson)

diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 368eb09dd62611098918badf804a341cf93a5411..b88f3017c19d7c912c5029aa6e90cef85afd488f 100644 (file)
--- 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 f8cf691d1fd36e15aa030b7ba937ed4225f3ed94..57eb0506609ff3982a65ddc88e44cf4b8da16717 100644 (file)
--- 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 9ec96b2cc1e2d93b363c1dabed671a5439642610..75d4746920d984d15a453a4e236340f8b52af638 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1765,
+/**/
+    1764,
 /**/
     1763,
 /**/