Add info about --eval and --display.

diff --git a/etc/NEWS b/etc/NEWS
index 829b06de2126e4ca012ff57fcd541fa3c27a2bd6..67f12f2fede30f9333685177a2f9bbf1310b3503 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -59,6 +59,11 @@ See the files mac/README and mac/INSTALL for build instructions.
 \f
 * Changes in Emacs 21.4
 
++++
+** The `emacsclient' understand the options `--eval' and `--display'
+which tell Emacs resp. to evaluate the given elisp expressions and
+to use the given display when visiting files.
+
 +++
 ** The mode line position information now comes before the major mode.
 When the file is maintained under version control, that information

diff --git a/man/misc.texi b/man/misc.texi
index ff82d04d7bea214fbdccb1b96fc44179063f1d68..8f9ba69a06b28e6a7dc7f29ebd93309cef26755a 100644 (file)
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -1300,6 +1300,16 @@ the value of the @samp{--alternate-editor} takes precedence.
 function which will communicate with a running Emacs server, or start
 one if none exists.
 
+If you use several displays, you can tell Emacs on which display to
+open the given files with the option @samp{--display=@var{DISPLAY}}.
+This can be used typically when connecting from home to an Emacs
+server running on your machine at your workplace.
+
+You can also use @code{emacsclient} to execute any piece of Emacs Lisp
+code, using the option @samp{--eval}.  When this option is given, the
+rest of the arguments is not taken as a list of files to visit but as
+a list of expressions to evaluate.
+
 @node Hardcopy, PostScript, Emacs Server, Top
 @section Hardcopy Output
 @cindex hardcopy