aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/server.el
diff options
context:
space:
mode:
authorGlenn Morris2012-02-01 23:48:39 -0800
committerGlenn Morris2012-02-01 23:48:39 -0800
commit953cebf5a8bde005bf7e56fd2ab31a32f32a3586 (patch)
tree09d121e0306be33e415376978a2625510c8d9121 /lisp/server.el
parent1b9f60cc53ca3918bbf807920cbaa43cf298a4cb (diff)
downloademacs-953cebf5a8bde005bf7e56fd2ab31a32f32a3586.tar.gz
emacs-953cebf5a8bde005bf7e56fd2ab31a32f32a3586.zip
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.el11
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."
126 126
127(defcustom server-auth-dir (locate-user-emacs-file "server/") 127(defcustom server-auth-dir (locate-user-emacs-file "server/")
128 "Directory for server authentication files. 128 "Directory for server authentication files.
129We only use this if `server-use-tcp' is non-nil.
130Otherwise we use `server-socket-dir'.
129 131
130NOTE: On FAT32 filesystems, directories are not secure; 132NOTE: On FAT32 filesystems, directories are not secure;
131files can be read and modified by any user or process. 133files can be read and modified by any user or process.
@@ -1525,7 +1527,14 @@ only these files will be asked to be saved."
1525 nil) 1527 nil)
1526 1528
1527(defun server-eval-at (server form) 1529(defun server-eval-at (server form)
1528 "Eval FORM on Emacs Server SERVER." 1530 "Contact the Emacs server named SERVER and evaluate FORM there.
1531Returns the result of the evaluation, or signals an error if it
1532cannot contact the specified server. For example:
1533 \(server-eval-at \"server\" '(emacs-pid))
1534returns the process ID of the Emacs instance running \"server\".
1535This function requires the use of TCP sockets. "
1536 (or server-use-tcp
1537 (error "This function requires TCP sockets"))
1529 (let ((auth-file (expand-file-name server server-auth-dir)) 1538 (let ((auth-file (expand-file-name server server-auth-dir))
1530 (coding-system-for-read 'binary) 1539 (coding-system-for-read 'binary)
1531 (coding-system-for-write 'binary) 1540 (coding-system-for-write 'binary)