diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/server.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index df02432e79a..0af5f330232 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-09-25 Juanma Barranquero <lekktu@gmail.com> + + * server.el (server-start): Revert part of 2010-08-08 change. Using + address 127.0.0.1 for local host is now done in Fmake_network_process. + 2010-09-24 Glenn Morris <rgm@gnu.org> * image-mode.el, progmodes/compile.el, progmodes/gud.el: diff --git a/lisp/server.el b/lisp/server.el index f0e88d03612..3a48efed7da 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -565,7 +565,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") (if server-use-tcp (list :family 'ipv4 ;; We're not ready for IPv6 yet :service t - :host (or server-host "127.0.0.1") ;; See bug#6781 + :host (or server-host 'local) :plist '(:authenticated nil)) (list :family 'local :service server-file |