0
0
mirror of https://github.com/vim/vim.git synced 2025-09-27 04:14:06 -04:00

updated for version 7.0-052

This commit is contained in:
Bram Moolenaar
2006-08-15 19:40:35 +00:00
parent 821d20a921
commit 5f40231e5a
2 changed files with 8 additions and 1 deletions

View File

@@ -3212,10 +3212,15 @@ prepare_server(parmp)
* Register for remote command execution with :serversend and --remote * Register for remote command execution with :serversend and --remote
* unless there was a -X or a --servername '' on the command line. * unless there was a -X or a --servername '' on the command line.
* Only register nongui-vim's with an explicit --servername argument. * 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 && ( if (X_DISPLAY != NULL && parmp->servername != NULL && (
# ifdef FEAT_GUI # ifdef FEAT_GUI
gui.in_use || (gui.in_use
# ifdef UNIX
&& getuid() != 0
# endif
) ||
# endif # endif
parmp->serverName_arg != NULL)) parmp->serverName_arg != NULL))
{ {

View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
52,
/**/ /**/
51, 51,
/**/ /**/