diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/server.el | 1 |
2 files changed, 6 insertions, 0 deletions
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 <lekktu@gmail.com> + + * 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 <larsi@gnus.org> * 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 |