[Emacs-diffs] master 0e8e5da: Mention EMACS_SOCKET_NAME, not XDG_RUNTIME_DIR.

[Paul Eggert]

branch: master
commit 0e8e5da1e8da0752fc02bf590a17697af4c0afd3
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Mention EMACS_SOCKET_NAME, not XDG_RUNTIME_DIR.
---
 doc/misc/efaq.texi | 8 ++++++--
 etc/NEWS           | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 1977045..18a857f 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2011,8 +2011,12 @@ When this is done, Emacs by default creates a Unix 
domain socket named
 desktop and @file{$TMPDIR/address@hidden otherwise.  See the variable
 @code{server-socket-dir}.  Traditionally, Emacs used
 @file{$TMPDIR/address@hidden even when running under an X desktop;
-if you prefer this traditional (and less-secure) behavior, unset
address@hidden before invoking Emacs and @samp{emacsclient}.
+if you prefer this traditional (and less-secure) behavior, you
+can set the environment variable @env{EMACS_SOCKET_NAME} to
address@hidden/address@hidden/server} before invoking Emacs and
address@hidden, although it will be your responsibility to create
+the directory @samp{$TMPDIR/address@hidden with appropriate
+ownership and permissions.
 
 To get your news reader, mail reader, etc., to invoke
 @samp{emacsclient}, try setting the environment variable @code{EDITOR}
diff --git a/etc/NEWS b/etc/NEWS
index e7f2d60..cad44f9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -133,8 +133,8 @@ to apply.
 as the directory for client/server sockets, if Emacs is running
 under an X Window System desktop that sets the XDG_RUNTIME_DIR
 environment variable to indicate where session sockets should go.
-To get the old and less-secure behavior, unset XDG_RUNTIME_DIR before
-invoking emacs and emacsclient.
+To get the old, less-secure behavior, you can set the
+EMACS_SOCKET_NAME environment variable to an appropriate value.
 
 ---
 *** When run by root, emacsclient no longer connects to non-root sockets.