[Emacs-diffs] /srv/bzr/emacs/trunk r102109: Add server-port option. (Bug#854)

[Glenn Morris]

------------------------------------------------------------
revno: 102109
author: Peter Oliver <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-26 00:40:07 -0700
message:
  Add server-port option.  (Bug#854)
  * lisp/server.el (server-port): New option.
  (server-start): Use server-port.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-26 03:58:19 +0000
+++ b/lisp/ChangeLog    2010-10-26 07:40:07 +0000
@@ -1,3 +1,8 @@
+2010-10-26  Peter Oliver  <address@hidden>  (tiny change)
+
+       * server.el (server-port): New option.
+       (server-start): Use server-port.
+
 2010-10-26  Glenn Morris  <address@hidden>
 
        * term/ns-win.el (ns-version-string): Remove unused declaration.

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2010-10-08 10:14:47 +0000
+++ b/lisp/server.el    2010-10-26 07:40:07 +0000
@@ -112,6 +112,15 @@
   :version "22.1")
 (put 'server-host 'risky-local-variable t)
 
+(defcustom server-port nil
+  "The port number that the server process should listen on."
+  :group 'server
+  :risky t
+  :type '(choice
+          (string :tag "Port number")
+          (const :tag "Random" nil))
+  :version "24.1")
+
 (defcustom server-auth-dir (locate-user-emacs-file "server/")
   "Directory for server authentication files.
 
@@ -564,7 +573,7 @@
                       ;; The other args depend on the kind of socket used.
                       (if server-use-tcp
                           (list :family 'ipv4  ;; We're not ready for IPv6 yet
-                                :service t
+                                :service (or server-port t)
                                 :host (or server-host 'local)
                                 :plist '(:authenticated nil))
                         (list :family 'local