diff options
| author | Bram Moolenaar <Bram@vim.org> | 2006-08-15 19:40:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2006-08-15 19:40:35 +0000 |
| commit | 5f40231e5a154698acd8c0e780216341d640ecf8 (patch) | |
| tree | 935e8861ed2ff897773f612610f9611410e4a074 | |
| parent | 821d20a92101ee30eb1628297bc6a1e1f9f7c9b7 (diff) | |
| download | vim-git-5f40231e5a154698acd8c0e780216341d640ecf8.tar.gz | |
updated for version 7.0-052v7.0.052
| -rw-r--r-- | src/main.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
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 @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 52, +/**/ 51, /**/ 50, |