# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1162896471 0
# Node ID e02dbec6d19caf4aee06c4df13158d5151b079d0
# Parent  fbfa7d8c0a64323b9d61eb49c0767de8ca5dbe47
*** empty log message ***

diff -r fbfa7d8c0a64 -r e02dbec6d19c lib-src/ChangeLog
--- a/lib-src/ChangeLog	Tue Nov 07 10:43:45 2006 +0000
+++ b/lib-src/ChangeLog	Tue Nov 07 10:47:51 2006 +0000
@@ -1,3 +1,9 @@
+2006-11-07  Juanma Barranquero  <lekktu@gmail.com>
+
+	* emacsclient.c (get_server_config): Extract also the Emacs pid
+	from the server file.  On Windows, try to force the Emacs frame to
+	the foreground.
+
 2006-11-06  Juanma Barranquero  <lekktu@gmail.com>
 
 	* emacsclient.c (longopts) [! NO_SOCKETS_IN_FILE_SYSTEM]: Don't show
diff -r fbfa7d8c0a64 -r e02dbec6d19c lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Nov 07 10:43:45 2006 +0000
+++ b/lisp/ChangeLog	Tue Nov 07 10:47:51 2006 +0000
@@ -1,3 +1,7 @@
+2006-11-07  Juanma Barranquero  <lekktu@gmail.com>
+
+	* server.el (server-start): Save also the Emacs pid in the server file.
+
 2006-11-07  Carsten Dominik  <dominik@science.uva.nl>
 
 	* textmodes/reftex-cite.el (reftex-pop-to-bibtex-entry): Preserve