Fix server-socket-dir initialization (rep. by Friedrich Delgado Friedrichs).

lisp/server.el (server-socket-dir): Remove premature initialization.
(server-start): Initialize server-socket-dir with the correct uid.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-175

1 files changed, 6 insertions, 2 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 9758ac1a7cb..620d4a7e5fa 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -161,8 +161,9 @@ are done with it in the server.")
 
 (defvar server-name "server")
 
-(defvar server-socket-dir
-  (format "/tmp/emacs%d" (user-uid)))
+(defvar server-socket-dir nil
+  "The directory in which to place the server socket.
+Initialized by `server-start'.")
 
 (defun server-client (proc)
   "Return the Emacs client corresponding to PROC.
@@ -367,6 +368,9 @@ Emacs distribution as your standard \"editor\".
 
 Prefix arg means just kill any existing server communications subprocess."
   (interactive "P")
+  ;; It is safe to get the user id now.
+  (setq server-socket-dir (or server-socket-dir
+                              (format "/tmp/emacs%d" (user-uid))))
   ;; Make sure there is a safe directory in which to place the socket.
   (server-ensure-safe-dir server-socket-dir)
   ;; kill it dead!