From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 29 Jun 2013 13:19:21 +0000 (+0200)
Subject: updated for version 7.3.1266
X-Git-Tag: v7.3.1266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8e3580be61f582aad05d3154896e73b0c414efb;p=vim

updated for version 7.3.1266
Problem:    QNX: GUI fails to start.
Solution:   Remove the QNX-specific #ifdef. (Sean Boudreau)
---

diff --git a/src/gui.c b/src/gui.c
index 6b7806c6f..06a99e6cb 100644
--- a/src/gui.c
+++ b/src/gui.c
@@ -206,12 +206,6 @@ gui_attempt_start()
     static void
 gui_do_fork()
 {
-#ifdef __QNXNTO__
-    procmgr_daemon(0, PROCMGR_DAEMON_KEEPUMASK | PROCMGR_DAEMON_NOCHDIR |
-	    PROCMGR_DAEMON_NOCLOSE | PROCMGR_DAEMON_NODEVNULL);
-    gui_attempt_start();
-    return;
-#else
     int		pipefd[2];	/* pipe between parent and child */
     int		pipe_error;
     int		status;
@@ -316,7 +310,6 @@ gui_do_fork()
     /* If we failed to start the GUI, exit now. */
     if (!gui.in_use)
 	exit(1);
-#endif
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 1d85f7326..b35ed20af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1266,
 /**/
     1265,
 /**/