Commit 03ae35cf authored by Stefan Monnier's avatar Stefan Monnier

(server-name): New var.

(server-socket-dir): New var to replace server-socket-name.
(server-start): Use them.
parent d9a4b477
...@@ -159,8 +159,10 @@ This means that the server should not kill the buffer when you say you ...@@ -159,8 +159,10 @@ This means that the server should not kill the buffer when you say you
are done with it in the server.") are done with it in the server.")
(make-variable-buffer-local 'server-existing-buffer) (make-variable-buffer-local 'server-existing-buffer)
(defvar server-socket-name (defvar server-name "server")
(format "/tmp/emacs%d/server" (user-uid)))
(defvar server-socket-dir
(format "/tmp/emacs%d" (user-uid)))
(defun server-log (string &optional client) (defun server-log (string &optional client)
"If a *server* buffer exists, write STRING to it for logging purposes." "If a *server* buffer exists, write STRING to it for logging purposes."
...@@ -246,12 +248,14 @@ Emacs distribution as your standard \"editor\". ...@@ -246,12 +248,14 @@ Emacs distribution as your standard \"editor\".
Prefix arg means just kill any existing server communications subprocess." Prefix arg means just kill any existing server communications subprocess."
(interactive "P") (interactive "P")
;; Make sure there is a safe directory in which to place the socket. ;; Make sure there is a safe directory in which to place the socket.
(server-ensure-safe-dir (file-name-directory server-socket-name)) (server-ensure-safe-dir server-socket-dir)
;; kill it dead! ;; kill it dead!
(if server-process (if server-process
(condition-case () (delete-process server-process) (error nil))) (condition-case () (delete-process server-process) (error nil)))
;; Delete the socket files made by previous server invocations. ;; Delete the socket files made by previous server invocations.
(condition-case () (delete-file server-socket-name) (error nil)) (condition-case ()
(delete-file (expand-file-name server-name server-socket-dir))
(error nil))
;; If this Emacs already had a server, clear out associated status. ;; If this Emacs already had a server, clear out associated status.
(while server-clients (while server-clients
(let ((buffer (nth 1 (car server-clients)))) (let ((buffer (nth 1 (car server-clients))))
...@@ -263,7 +267,7 @@ Prefix arg means just kill any existing server communications subprocess." ...@@ -263,7 +267,7 @@ Prefix arg means just kill any existing server communications subprocess."
(setq server-process (setq server-process
(make-network-process (make-network-process
:name "server" :family 'local :server t :noquery t :name "server" :family 'local :server t :noquery t
:service server-socket-name :service (expand-file-name server-name server-socket-dir)
:sentinel 'server-sentinel :filter 'server-process-filter :sentinel 'server-sentinel :filter 'server-process-filter
;; We must receive file names without being decoded. ;; We must receive file names without being decoded.
;; Those are decoded by server-process-filter according ;; Those are decoded by server-process-filter according
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment