From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 15 Aug 2006 19:40:35 +0000 (+0000)
Subject: updated for version 7.0-052
X-Git-Tag: v7.0.052
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f40231e5a154698acd8c0e780216341d640ecf8;p=vim

updated for version 7.0-052
---

diff --git a/src/main.c b/src/main.c
index 86558e0f4..8c32106a3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3212,10 +3212,15 @@ prepare_server(parmp)
      * Register for remote command execution with :serversend and --remote
      * unless there was a -X or a --servername '' on the command line.
      * Only register nongui-vim's with an explicit --servername argument.
+     * When running as root --servername is also required.
      */
     if (X_DISPLAY != NULL && parmp->servername != NULL && (
 #  ifdef FEAT_GUI
-		gui.in_use ||
+		(gui.in_use
+#   ifdef UNIX
+		 && getuid() != 0
+#   endif
+		) ||
 #  endif
 		parmp->serverName_arg != NULL))
     {
diff --git a/src/version.c b/src/version.c
index c0e6629eb..6d6ce8214 100644
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    52,
 /**/
     51,
 /**/