diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-08-08 17:12:29 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-08-08 17:12:29 -0400 |
| commit | 7815fe1985833c57457882b415a29358991dabdc (patch) | |
| tree | ab8aabf9ad322c149a6434712c14b93bb93543dc /lisp/server.el | |
| parent | 25717ca11cae32e191e3dc9318562190d682f425 (diff) | |
| parent | e54a1075033073f835596ab666eeed099028beb8 (diff) | |
| download | emacs-7815fe1985833c57457882b415a29358991dabdc.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/server.el b/lisp/server.el index b2198caec4c..b2cb829adf7 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -563,9 +563,9 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") :coding 'raw-text-unix ;; The other args depend on the kind of socket used. (if server-use-tcp - (list :family nil + (list :family 'ipv4 ;; We're not ready for IPv6 yet :service t - :host (or server-host 'local) + :host (or server-host "127.0.0.1") ;; See bug#6781 :plist '(:authenticated nil)) (list :family 'local :service server-file |