summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuanma Barranquero <lekktu@gmail.com>2006-11-07 10:47:51 +0000
committerJuanma Barranquero <lekktu@gmail.com>2006-11-07 10:47:51 +0000
commit18b8c421dc9733b870e68d7dc996416451b9809a (patch)
tree823540509795a8a3940ec30c9a6d94bc3178c00f
parent434a6c5d78587690f7b052fa1af83a9c800a1e8f (diff)
downloademacs-18b8c421dc9733b870e68d7dc996416451b9809a.tar.gz
*** empty log message ***
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lisp/ChangeLog4
2 files changed, 10 insertions, 0 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index c240cfb956b..9210fa6afba 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 76d66379c73..c0eac60c44f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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