bug#854: Server port customisation

bug#854: Server port customisation

[Peter Oliver]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 61 bytes --]

Here is an updated patch against bzr trunk.

-- 
Peter Oliver

[-- Attachment #2: Type: TEXT/PLAIN, Size: 2812 bytes --]

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bzr@mavit.org.uk-20101023121921-94keq3071lh91wo1
# target_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/
# testament_sha1: b9c0513f2324b358b13e0b456298c9682cd9bb60
# timestamp: 2010-10-23 13:27:38 +0100
# source_branch: bzr://bzr.savannah.gnu.org/emacs/trunk/
# base_revision_id: jan.h.d@swipnet.se-20101023091819-s23vam6s62t5x44v
# 
# Begin patch
=== modified file 'lisp/server.el'
--- lisp/server.el	2010-10-08 10:14:47 +0000
+++ lisp/server.el	2010-10-23 12:19:21 +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
+  :type '(choice
+          (string :tag "Port number")
+          (const :tag "Random" nil))
+  :version "22.1")
+(put 'server-port 'risky-local-variable t)
+
 (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

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRy6V3wAAbNfgEEwUOP/93IA
1AC////wUAPe82Do1bAAhoiaRmpiNMjE2pkwgAA0AI1ImJ6ZpTT1MTR6mmg0GgAAAwAAAAGgAAAA
AamJTZID0j1PUBoAAaDTTQASSBGhoINACDKbVP1I09QMDUdAZQpPVugz/6zkaKo9/5v/2G9qzN1d
EGvfdXDdCT56BOCp5gjqaCYkk0hESo+ymLYQsmZZTgkTrGG1VQQHt1H2cXGkQthqMMGO6Ur9IyIL
PG97ckFw2xnwDyM1GoEBbbnSDQ+IKjpf9gxoxRFMCVACikwTeayjIyS8puyR1ThTUlUI6JZvswmQ
So5zXLzc4QyQzIGUC/r9YnIWQMuy5qCg1vyGJsqh/k1wqOlwmkfvxcg+ZuO3etYLAhHAT7J4365r
3GNSl5W+x9gzxXPata2i00Kbjbq2btG8V6Wy7ehZXqIrxXXzH2IO64W8FSTanBA4JsPwJykMKUlw
bTXnxUImzaTWiKHpxkn/pYzkqduJaSiJRMIzJF8BxhMYQ8mEGyNZPUVzQMnEjhmEt3Bxq4J2i3bS
psZa9ixiNAl2T6Na7UPFWVnSiwuiqick0ZXRmyuULczSO22XNXR8sa4ivyhQXUWEhW8xY2xoeVKr
DGwy0Q0xhg6qKhSA9yatpSJhU8m5y7mW/PZkCDZzz6qyJRRXlmRjuh5p0lvKIUZkhiAJP1BRpUP4
x7dT29ab50L8wldZ8LKr4VX563oqs1MXMl8sTIbyDEMLYXIsqBKDTcwhMsVSuiCoUt6znFSWJucR
vwtNR1u2NdYpYrKAPJtAw18zqKKKRglgRcqJEgQ7g0p3yo0Y1tOzrLAu8EuJYcGxmobpLxg2jKGe
G9TsZtX/OMNPsXpl8xOHschhX7YYw3OEcNe80r80Cahx3G/0TueY7fnCLy6pVSvPXl6fxW43lw/J
JyPvDVzXQTtgZ/ppQhQIGNpnvdfj8JquRAy2KBp6BSztnohlWwfdcsgnmOSe6LVqmvuJm5i1hsyn
wezGpzgeFrgrh6MXdReNnxbn8Wccrzkqlh42rzSmRxyK9rQgOg02IJli6AM/5KuBfI4KVaIsoDlv
iKSwvJeOXnyc1iiy7vqPOQdUqLJd2UFlSu80dM8c2ZOPrPQtRJmpN1eWYuyZbWLGSM0nB5wRVzmR
ShV66/xFXvg7nKImZhDLVku6rfplwXHGmAzHr9GgXNjHhaD2oujqGxnbiYbm81ZDZpeDqFj5pWL3
Uo/YtJuaV9h0Yr23TH1isTNBld361MrdG5K3rMi+3ecvdbvovapiayyYDFtYaUqqL0Xggd4GLYTM
gm9lsKFQH8XckU4UJAculd8A

bug#854: Server port customisation

[Glenn Morris]

Peter Oliver wrote:

> Here is an updated patch against bzr trunk.

It's not updated if it still says "version 22.1"; but thanks, applied.
;)