summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2011-08-28 14:46:38 -0400
committerChong Yidong <cyd@stupidchicken.com>2011-08-28 14:46:38 -0400
commit7a1ff57fac7cba948020a7360eb630475945cbf8 (patch)
treed0d66e6ad7ed47c4fa26f661bdb6501e9b6e14d6
parentef8cdf8c2abe4c25f9f71fd7ccb409a61d18aa90 (diff)
downloademacs-7a1ff57fac7cba948020a7360eb630475945cbf8.tar.gz
* lisp/server.el (server-port): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/server.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 39ac42fe6b0..4af6010b556 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-28 Chong Yidong <cyd@stupidchicken.com>
+
+ * server.el (server-port): Doc fix.
+
2011-08-28 Alan Mackenzie <acm@muc.de>
* progmodes/cc-fonts.el
diff --git a/lisp/server.el b/lisp/server.el
index c91f10b6584..63d46a365c9 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -112,7 +112,10 @@ If set, the server accepts remote connections; otherwise it is local."
(put 'server-host 'risky-local-variable t)
(defcustom server-port nil
- "The port number that the server process should listen on."
+ "The port number that the server process should listen on.
+This variable only takes effect when the Emacs server is using
+TCP instead of local sockets. A nil value means to use a random
+port number."
:group 'server
:type '(choice
(string :tag "Port number")