diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-11 18:35:20 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-03-11 18:35:20 +0000 |
| commit | 891fdb5dd3ccf6cc5f86b3036bfae337c4abfe62 (patch) | |
| tree | 486e11680512842caba61fb1bb611992a23bfbac /lisp/server.el | |
| parent | 35739d1882b8f7626da73c22f2f00d1b86606ad7 (diff) | |
| download | emacs-891fdb5dd3ccf6cc5f86b3036bfae337c4abfe62.tar.gz | |
(server-name): New var.
(server-socket-dir): New var to replace server-socket-name.
(server-start): Use them.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/server.el b/lisp/server.el index a6b2742190f..3a8bede9f95 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -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.") (make-variable-buffer-local 'server-existing-buffer) -(defvar server-socket-name - (format "/tmp/emacs%d/server" (user-uid))) +(defvar server-name "server") + +(defvar server-socket-dir + (format "/tmp/emacs%d" (user-uid))) (defun server-log (string &optional client) "If a *server* buffer exists, write STRING to it for logging purposes." @@ -246,12 +248,14 @@ Emacs distribution as your standard \"editor\". Prefix arg means just kill any existing server communications subprocess." (interactive "P") ;; 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! (if server-process (condition-case () (delete-process server-process) (error nil))) ;; 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. (while server-clients (let ((buffer (nth 1 (car server-clients)))) @@ -263,7 +267,7 @@ Prefix arg means just kill any existing server communications subprocess." (setq server-process (make-network-process :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 ;; We must receive file names without being decoded. ;; Those are decoded by server-process-filter according |