diff options
| author | Daniel Pittman <slippycheeze@google.com> | 2018-09-05 09:44:58 -0400 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2018-10-27 12:18:27 +0300 |
| commit | 3e81e9a0e7742197354515f3d3ea55fdb201eb29 (patch) | |
| tree | 7ea45bc194843b5c6c5564a3be96fa67306e90b7 | |
| parent | 8fffac14b19d375f774b835ea33ef8989300125d (diff) | |
| download | emacs-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
| -rw-r--r-- | doc/emacs/misc.texi | 4 | ||||
| -rw-r--r-- | doc/man/emacsclient.1 | 1 | ||||
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lib-src/emacsclient.c | 3 |
4 files changed, 14 insertions, 0 deletions
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 236cb07785c..ab33cafb8e8 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -1966,6 +1966,10 @@ is given by the variable @code{server-name} on the Emacs server. If this option is omitted, @command{emacsclient} connects to the first server it finds. (This option is not supported on MS-Windows.) +Alternatively, you can set the @env{EMACS_SOCKET_NAME} environment +variable to point to the server socket. (The command-line option +overrides the environment variable.) + @item -t @itemx --tty @itemx -nw 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 @@ -120,6 +120,12 @@ the new version of the file again.) * Changes in Emacs 27.1 +++ +** emacsclient uses EMACS_SOCKET_NAME if --socket-name is not set. +The behavior is identical to the EMACS_SERVER_FILE, in that the +command line value will override the environment, and the natural +default to TMPDIR, then /tmp, continues to apply. + ++++ ** The function 'read-passwd' uses '*' as default character to hide passwords. --- 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) #ifndef NO_SOCKETS_IN_FILE_SYSTEM /* Explicit --socket-name argument. */ + if (!socket_name) + socket_name = egetenv ("EMACS_SOCKET_NAME"); + if (socket_name) { s = set_local_socket (socket_name); |