[Emacs-diffs] /srv/bzr/emacs/trunk r101696: lisp/server.el (server-start): For compatibility, revert part of revno 101688.

[Juanma Barranquero]

------------------------------------------------------------
revno: 101696
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Fri 2010-10-01 03:28:45 +0200
message:
  lisp/server.el (server-start): For compatibility, revert part of revno 101688.
modified:
  lisp/ChangeLog
  lisp/server.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-01 00:34:42 +0000
+++ b/lisp/ChangeLog    2010-10-01 01:28:45 +0000
@@ -1,3 +1,8 @@
+2010-10-01  Juanma Barranquero  <address@hidden>
+
+       * server.el (server-start): Revert part of revno 101688.
+       Let's not break compatibility gratuitously, shall we?
+
 2010-09-30  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/tls.el (tls-starttls-switches): New variable.

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2010-09-30 02:53:26 +0000
+++ b/lisp/server.el    2010-10-01 01:28:45 +0000
@@ -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