changeset 110668:838ae151fca7

lisp/server.el (server-start): For compatibility, revert part of revno 101688.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 01 Oct 2010 03:28:45 +0200
parents a554263b06d4
children 1ec34887255d
files lisp/ChangeLog lisp/server.el
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Fri Oct 01 00:34:42 2010 +0000
+++ b/lisp/ChangeLog	Fri Oct 01 03:28:45 2010 +0200
@@ -1,3 +1,8 @@
+2010-10-01  Juanma Barranquero  <lekktu@gmail.com>
+
+	* server.el (server-start): Revert part of revno 101688.
+	Let's not break compatibility gratuitously, shall we?
+
 2010-09-30  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* net/tls.el (tls-starttls-switches): New variable.
--- a/lisp/server.el	Fri Oct 01 00:34:42 2010 +0000
+++ b/lisp/server.el	Fri Oct 01 03:28:45 2010 +0200
@@ -586,6 +586,7 @@
 		(setq buffer-file-coding-system 'no-conversion)
 		(insert (format-network-address
 			 (process-contact server-process :local))
+			" " (number-to-string (emacs-pid)) ; Kept for compatibility
 			"\n" auth-key)))))))))
 
 ;;;###autoload