Add info about --eval and --display.

2 files changed, 15 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 829b06de212..67f12f2fede 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -60,6 +60,11 @@ See the files mac/README and mac/INSTALL for build instructions.
 * 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
 appears between the position information and the major mode.
diff --git a/man/misc.texi b/man/misc.texi
index ff82d04d7be..8f9ba69a06b 100644
--- 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