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 368eb09..b88f301 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -738,6 +738,10 @@
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 @@
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 f8cf691..57eb050 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -5138,7 +5138,8 @@
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 @@
{
close(2);
ignored = dup(null_fd);
+ stderr_works = FALSE;
}
else if (use_out_for_err)
{
@@ -5210,7 +5212,8 @@
/* 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 9ec96b2..75d4746 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,10 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1765,
+/**/
+ 1764,
+/**/
1763,
/**/
1762,