Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 902-908)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 131-137)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 261-262)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278

1 files changed, 16 insertions, 1 deletions

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6ea05fb9e9a..14b668d2d24 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,18 @@
+2007-10-26  Juanma Barranquero  <lekktu@gmail.com>
+
+        * emacsclient.c: Add a wrapper for getenv so it also checks the
+        registry on Windows.  Suggestion and algorithm by Eli Zaretskii.
+        Code partially based on w32_get_resource and init_environment (w32.c).
+        (egetenv): New wrapper for getenv.
+        (get_current_dir_name, decode_options, get_server_config)
+        (set_local_socket, set_socket, main): Use egetenv, not getenv.
+        (w32_get_resource, w32_getenv) [WINDOWSNT]: New functions.
+
+2007-10-25  Jason Rumney  <jasonr@gnu.org>
+
+        * emacsclient.c (sock_err_message): New function.
+        (set_tcp_socket): Use it.
+
 2007-10-09  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacsclient.c (print_help_and_exit): Fix space to improve
@@ -60,7 +75,7 @@
         option.
         (main) [NO_SOCKETS_IN_FILE_SYSTEM]: Don't call init_signals.
 
-2007-08-29  Karoly Lorentey  <lorentey@elte.hu>
+2007-08-29  K,Aa(Broly L$,1 q(Brentey  <lorentey@elte.hu>
 
         * emacsclient.c (signal.h): New include.
         (sys/stat.h, errno.h): Always include, even on WINDOWSNT.