aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorPaul Eggert2018-02-12 12:52:44 -0800
committerPaul Eggert2018-02-12 12:57:59 -0800
commit3a718ffca097b35218c3e041a94adff937f3052f (patch)
treeeafff7d03915adfc1a6c8258f35e450d0ed4754c /lisp
parent99cf1bb011e9a0848e0e1988c2441c472f8d9980 (diff)
downloademacs-3a718ffca097b35218c3e041a94adff937f3052f.tar.gz
emacs-3a718ffca097b35218c3e041a94adff937f3052f.zip
Finish renaming to internal--daemon-sockname
* doc/lispref/processes.texi (Misc Network): Omit discussion of internal--daemon-sockname, as non-Emacs code shouldn't rely on it. * src/process.c (syms_of_process): Rename internal-daemon-sockname to internal--daemon-sockname. All uses changed.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/server.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/server.el b/lisp/server.el
index 744568a77da..d3933883cf7 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -258,8 +258,8 @@ prevents multiple initializations when an external socket has
258been consumed.") 258been consumed.")
259 259
260(defcustom server-name 260(defcustom server-name
261 (if internal-daemon-sockname 261 (if internal--daemon-sockname
262 (file-name-nondirectory internal-daemon-sockname) 262 (file-name-nondirectory internal--daemon-sockname)
263 "server") 263 "server")
264 "The name of the Emacs server, if this Emacs process creates one. 264 "The name of the Emacs server, if this Emacs process creates one.
265The command `server-start' makes use of this. It should not be 265The command `server-start' makes use of this. It should not be
@@ -271,8 +271,8 @@ changed while a server is running."
271;; We do not use `temporary-file-directory' here, because emacsclient 271;; We do not use `temporary-file-directory' here, because emacsclient
272;; does not read the init file. 272;; does not read the init file.
273(defvar server-socket-dir 273(defvar server-socket-dir
274 (if internal-daemon-sockname 274 (if internal--daemon-sockname
275 (file-name-directory internal-daemon-sockname) 275 (file-name-directory internal--daemon-sockname)
276 (and (featurep 'make-network-process '(:family local)) 276 (and (featurep 'make-network-process '(:family local))
277 (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid)))) 277 (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid))))
278 "The directory in which to place the server socket. 278 "The directory in which to place the server socket.
@@ -631,7 +631,7 @@ To force-start a server, do \\[server-force-delete] and then
631 ;; Check to see if an uninitialized external socket has been 631 ;; Check to see if an uninitialized external socket has been
632 ;; passed in, if that is the case, skip checking 632 ;; passed in, if that is the case, skip checking
633 ;; `server-running-p' as this will return the wrong result. 633 ;; `server-running-p' as this will return the wrong result.
634 (if (and internal-daemon-sockname 634 (if (and internal--daemon-sockname
635 (not server--external-socket-initialized)) 635 (not server--external-socket-initialized))
636 (setq server--external-socket-initialized t) 636 (setq server--external-socket-initialized t)
637 ;; Delete the socket files made by previous server invocations. 637 ;; Delete the socket files made by previous server invocations.