updated for version 7.0-052

diff --git a/src/main.c b/src/main.c
index 86558e0f47ca6fd5c17e89ead2e85ea3b023eb0b..8c32106a390d1c27aaa151d388b0216931e0ffdf 100644 (file)
--- 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 c0e6629eb39a3fff560e841bbb8cf4b695b5b215..6d6ce82148a6ed6fa096be8319bebedfce5ca1a3 100644 (file)
--- 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,
 /**/