aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorDaniel Pittman2018-09-05 09:44:58 -0400
committerEli Zaretskii2018-10-27 12:18:27 +0300
commit3e81e9a0e7742197354515f3d3ea55fdb201eb29 (patch)
tree7ea45bc194843b5c6c5564a3be96fa67306e90b7 /lib-src
parent8fffac14b19d375f774b835ea33ef8989300125d (diff)
downloademacs-3e81e9a0e7742197354515f3d3ea55fdb201eb29.tar.gz
emacs-3e81e9a0e7742197354515f3d3ea55fdb201eb29.zip
Add support in emacsclient for EMACS_SOCKET_NAME
If the '--socket-name' argument is unspecified, the environment variable 'EMACS_SOCKET_NAME' is now consulted with the same semantics. This mirrors the behavior of the '--server-file' argument, and allows for easier configuration of emacsclient when the socket is in a location other than 'TMPDIR' or '/tmp'. * emacsclient.c (set_socket): Add support for the EMACS_SOCKET_NAME environment variable. (Bug#33095) * misc.texi (emacsclient Options): * emacsclient.1: Document the EMACS_SOCKET_NAME environment variable. * etc/NEWS: Announce the new feature. Copyright-paperwork-exempt: yes
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/emacsclient.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 4fe3a588b19..42b8dd6227b 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1409,6 +1409,9 @@ set_socket (int no_exit_if_error)
1409 1409
1410#ifndef NO_SOCKETS_IN_FILE_SYSTEM 1410#ifndef NO_SOCKETS_IN_FILE_SYSTEM
1411 /* Explicit --socket-name argument. */ 1411 /* Explicit --socket-name argument. */
1412 if (!socket_name)
1413 socket_name = egetenv ("EMACS_SOCKET_NAME");
1414
1412 if (socket_name) 1415 if (socket_name)
1413 { 1416 {
1414 s = set_local_socket (socket_name); 1417 s = set_local_socket (socket_name);