summaryrefslogtreecommitdiff
path: root/doc/man
diff options
context:
space:
mode:
authorDaniel Pittman <slippycheeze@google.com>2018-09-05 09:44:58 -0400
committerEli Zaretskii <eliz@gnu.org>2018-10-27 12:18:27 +0300
commit3e81e9a0e7742197354515f3d3ea55fdb201eb29 (patch)
tree7ea45bc194843b5c6c5564a3be96fa67306e90b7 /doc/man
parent8fffac14b19d375f774b835ea33ef8989300125d (diff)
downloademacs-3e81e9a0e7742197354515f3d3ea55fdb201eb29.tar.gz
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 'doc/man')
-rw-r--r--doc/man/emacsclient.11
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/man/emacsclient.1 b/doc/man/emacsclient.1
index 5aaa6d1f083..24ca1c9a468 100644
--- a/doc/man/emacsclient.1
+++ b/doc/man/emacsclient.1
@@ -94,6 +94,7 @@ open a new Emacs frame on the current terminal
.TP
.B \-s, \-\-socket-name=FILENAME
use socket named FILENAME for communication.
+This can also be specified via the EMACS_SOCKET_NAME environment variable.
.TP
.B \-V, \-\-version
print version information and exit