From: Juanma Barranquero Date: Fri, 1 Oct 2010 01:28:45 +0000 (+0200) Subject: lisp/server.el (server-start): For compatibility, revert part of 2010-09-30T02:53... X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~46^2~278 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a16f5f64c766b006d52d6decfef8ac47b77580b5;p=emacs.git lisp/server.el (server-start): For compatibility, revert part of 2010-09-30T02:53:26Z!lekktu@gmail.com. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 07dbc824cd5..901a5fb53a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2010-10-01 Juanma Barranquero + + * server.el (server-start): Revert part of 2010-09-30T02:53:26Z!lekktu@gmail.com. + Let's not break compatibility gratuitously, shall we? + 2010-09-30 Lars Magne Ingebrigtsen * net/tls.el (tls-starttls-switches): New variable. diff --git a/lisp/server.el b/lisp/server.el index 87250fd3aaf..0f1b0219a2c 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -586,6 +586,7 @@ server or call `M-x server-force-delete' to forcibly disconnect it.") (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