diff options
author | Glenn Morris <rgm@gnu.org> | 2012-02-01 23:48:39 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2012-02-01 23:48:39 -0800 |
commit | 953cebf5a8bde005bf7e56fd2ab31a32f32a3586 (patch) | |
tree | 09d121e0306be33e415376978a2625510c8d9121 /lisp/server.el | |
parent | 1b9f60cc53ca3918bbf807920cbaa43cf298a4cb (diff) | |
download | emacs-953cebf5a8bde005bf7e56fd2ab31a32f32a3586.tar.gz |
server.el doc fixes
* lisp/server.el (server-auth-dir): Doc fix.
(server-eval-at): Doc fix. Give an explicit error if !server-use-tcp.
* etc/NEWS: Markup.
Diffstat (limited to 'lisp/server.el')
-rw-r--r-- | lisp/server.el | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index 9dcd1f3b1d9..a08f971e88c 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -126,6 +126,8 @@ port number." (defcustom server-auth-dir (locate-user-emacs-file "server/") "Directory for server authentication files. +We only use this if `server-use-tcp' is non-nil. +Otherwise we use `server-socket-dir'. NOTE: On FAT32 filesystems, directories are not secure; files can be read and modified by any user or process. @@ -1525,7 +1527,14 @@ only these files will be asked to be saved." nil) (defun server-eval-at (server form) - "Eval FORM on Emacs Server SERVER." + "Contact the Emacs server named SERVER and evaluate FORM there. +Returns the result of the evaluation, or signals an error if it +cannot contact the specified server. For example: + \(server-eval-at \"server\" '(emacs-pid)) +returns the process ID of the Emacs instance running \"server\". +This function requires the use of TCP sockets. " + (or server-use-tcp + (error "This function requires TCP sockets")) (let ((auth-file (expand-file-name server server-auth-dir)) (coding-system-for-read 'binary) (coding-system-for-write 'binary) |