From: Glenn Morris <rgm@gnu.org>
Date: Wed, 8 May 2019 14:51:48 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~2937
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8b789755b45e6e10ed2809d7a7b89146b28452fc;p=emacs.git

Merge from origin/emacs-26

1c6484e (origin/emacs-26) Fix incorrect cloning of eieio-instance-inh...
37436fe Fix cloning of eieio-named objects (Bug#22840)
fb65a36 Fix ibuffer-unmark-backward synopsis (bug#35572)
f77bd2b ; * src/lisp.h (DEFSYM): Fix inaccurate comment.
3b86e0b Clarify handling of long options (Bug#24949)
04340a8 Improve documentation of the daemon and emacsclient
3e29de2 * etc/NEWS.24: Belatedly announce delete-consecutive-dups.
---

8b789755b45e6e10ed2809d7a7b89146b28452fc
diff --cc doc/emacs/misc.texi
index 5f743927367,fc6b4cf1e7c..8bb603f49fa
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@@ -1983,11 -1925,10 +1983,14 @@@ omitted, @command{emacsclient} connect
  If you set @code{server-name} of the Emacs server to an absolute file
  name, give the same absolute file name as @var{server-name} to this
  option to instruct @command{emacsclient} to connect to that server.
+ You need to use this option if you started Emacs as daemon
+ (@pxref{Initial Options}) and specified the name for the server
+ started by the daemon.
  
 +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