bug#18658: 24.3; deformed server-socket-dir

[Devon Sean McCullough]

Double slashes in server-socket-dir is a bug waiting to happen.

                Peace
                        --Devon

P.S. Fix follows:

--- lisp/server.el.~1~  2014-10-07 13:27:34.000000000 -0400
+++ lisp/server.el      2014-10-07 13:34:03.000000000 -0400
@@ -266,7 +266,10 @@
 ;; does not read the init file.
 (defvar server-socket-dir
   (and (featurep 'make-network-process '(:family local))
-       (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid)))
+       (expand-file-name (format "emacs%d" 
+                                (user-uid))
+                        (or (getenv "TMPDIR")
+                            "/tmp")))
   "The directory in which to place the server socket.
 If local sockets are not supported, this is nil.")