# HG changeset patch # User Juanma Barranquero # Date 1164213443 0 # Node ID 1611531c83d148b94b99ecbd0e859bf92c2c7855 # Parent 8a39f8452a5bd4114efec5690c894e6ccb5d75f9 (DESCRIPTION): Suggest also `server-mode'. (OPTIONS): Document `-f', `--server-file' and EMACS_SERVER_FILE. diff -r 8a39f8452a5b -r 1611531c83d1 etc/emacsclient.1 --- a/etc/emacsclient.1 Wed Nov 22 15:17:47 2006 +0000 +++ b/etc/emacsclient.1 Wed Nov 22 16:37:23 2006 +0000 @@ -29,10 +29,10 @@ For .B emacsclient -to work, you need an already running Emacs with a server. Within Emacs, call -the function -`server-start'. (Your `.emacs' file can do this automatically if you -add the expression `(server-start)' to it.) +to work, you need an already running Emacs with a server. Within Emacs, +call the functions `server-start' or `server-mode'. (Your `.emacs' file +can do this automatically if you add either `(server-start)' or +`(server-mode 1)' to it.) When you've finished editing the buffer, type `C-x #' (`server-edit'). This saves the file and sends a message back to the @@ -57,7 +57,11 @@ Lisp expressions. .TP .B \-s, \-\-socket-name=FILENAME -Use socket named FILENAME for communication. +use socket named FILENAME for communication. +.TP +.B \-f, \-\-server-file=FILENAME +use TCP configuration file FILENAME for communication. +This can also be specified via the `EMACS_SERVER_FILE' environment variable. .TP .B \-a, \-\-alternate-editor=EDITOR if the Emacs server is not running, run the specified editor instead.