aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2011-08-28 14:46:38 -0400
committerChong Yidong2011-08-28 14:46:38 -0400
commit7a1ff57fac7cba948020a7360eb630475945cbf8 (patch)
treed0d66e6ad7ed47c4fa26f661bdb6501e9b6e14d6
parentef8cdf8c2abe4c25f9f71fd7ccb409a61d18aa90 (diff)
downloademacs-7a1ff57fac7cba948020a7360eb630475945cbf8.tar.gz
emacs-7a1ff57fac7cba948020a7360eb630475945cbf8.zip
* 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 @@
12011-08-28 Chong Yidong <cyd@stupidchicken.com>
2
3 * server.el (server-port): Doc fix.
4
12011-08-28 Alan Mackenzie <acm@muc.de> 52011-08-28 Alan Mackenzie <acm@muc.de>
2 6
3 * progmodes/cc-fonts.el 7 * 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."
112(put 'server-host 'risky-local-variable t) 112(put 'server-host 'risky-local-variable t)
113 113
114(defcustom server-port nil 114(defcustom server-port nil
115 "The port number that the server process should listen on." 115 "The port number that the server process should listen on.
116This variable only takes effect when the Emacs server is using
117TCP instead of local sockets. A nil value means to use a random
118port number."
116 :group 'server 119 :group 'server
117 :type '(choice 120 :type '(choice
118 (string :tag "Port number") 121 (string :tag "Port number")