diff options
| author | Matthew Leach <matthew@mattleach.net> | 2018-02-12 12:52:44 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-12 12:57:59 -0800 |
| commit | 99cf1bb011e9a0848e0e1988c2441c472f8d9980 (patch) | |
| tree | 6cdc365c0f6787fb477480d29e349da2864d4d22 /lisp | |
| parent | b9a3cd6899136e13088003c3430e227be3faf9bb (diff) | |
| download | emacs-99cf1bb011e9a0848e0e1988c2441c472f8d9980.tar.gz emacs-99cf1bb011e9a0848e0e1988c2441c472f8d9980.tar.bz2 emacs-99cf1bb011e9a0848e0e1988c2441c472f8d9980.zip | |
Rename internal--external-sockname and document (Bug#24218)
* lisp/server.el: Rename `internal--external-sockname' to
`internal-daemon-sockname'.
* src/process.c: Likewise.
* doc/lispref/processes.texi: Document `internal-daemon-sockname'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/server.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/server.el b/lisp/server.el index 70ac51e27db..744568a77da 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -258,8 +258,8 @@ prevents multiple initializations when an external socket has been consumed.") (defcustom server-name - (if internal--external-sockname - (file-name-nondirectory internal--external-sockname) + (if internal-daemon-sockname + (file-name-nondirectory internal-daemon-sockname) "server") "The name of the Emacs server, if this Emacs process creates one. The command `server-start' makes use of this. It should not be @@ -271,8 +271,8 @@ changed while a server is running." ;; We do not use `temporary-file-directory' here, because emacsclient ;; does not read the init file. (defvar server-socket-dir - (if internal--external-sockname - (file-name-directory internal--external-sockname) + (if internal-daemon-sockname + (file-name-directory internal-daemon-sockname) (and (featurep 'make-network-process '(:family local)) (format "%s/emacs%d" (or (getenv "TMPDIR") "/tmp") (user-uid)))) "The directory in which to place the server socket. @@ -631,7 +631,7 @@ To force-start a server, do \\[server-force-delete] and then ;; Check to see if an uninitialized external socket has been ;; passed in, if that is the case, skip checking ;; `server-running-p' as this will return the wrong result. - (if (and internal--external-sockname + (if (and internal-daemon-sockname (not server--external-socket-initialized)) (setq server--external-socket-initialized t) ;; Delete the socket files made by previous server invocations. |