Mention unsetting XDG_RUNTIME_DIR in doc.

2 files changed, 6 insertions, 1 deletions

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index d457267c248..19770455f10 100644
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -2009,7 +2009,10 @@ When this is done, Emacs by default creates a Unix domain socket named
 @file{server} in a well-known directory, typically
 @file{$XDG_RUNTIME_DIR/emacs} if Emacs is running under an X Window System
 desktop and @file{$TMPDIR/emacs@var{userid}} otherwise.  See the variable
-@code{server-socket-dir}.
+@code{server-socket-dir}.  Traditionally, Emacs used
+@file{$TMPDIR/emacs@var{userid}} even when running under an X desktop;
+if you prefer this traditional (and less-secure) behavior, unset
+@env{XDG_RUNTIME_DIR} before invoking Emacs and @samp{emacsclient}.
 
 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 60cba9ed469..e7f2d606f8c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -133,6 +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.
 
 ---
 *** When run by root, emacsclient no longer connects to non-root sockets.