Merge changes from emacs-23 branch

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index b2198caec4c6f2dc641baaf03d2a8daeafa28ca5..b2cb829adf759fcca110c77704a07649a3a85a25 100644 (file)
--- 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