# HG changeset patch # User Juanma Barranquero # Date 1162898432 0 # Node ID cbc1f46b6590ce73e08e17b474c9cffb9105692f # Parent 2889a065b1d432697d3a0a8b2bfd203bfd02c0e5 (get_server_config) [WINDOWSNT]: Search the server file on APPDATA if it doesn't exist on HOME, even if HOME is defined. diff -r 2889a065b1d4 -r cbc1f46b6590 lib-src/emacsclient.c --- a/lib-src/emacsclient.c Tue Nov 07 10:58:19 2006 +0000 +++ b/lib-src/emacsclient.c Tue Nov 07 11:20:32 2006 +0000 @@ -449,16 +449,21 @@ else { char *home = getenv ("HOME"); -#ifdef WINDOWSNT - if (! home) - home = getenv ("APPDATA"); -#endif + if (home) { char *path = alloca (32 + strlen (home) + strlen (server_file)); sprintf (path, "%s/.emacs.d/server/%s", home, server_file); config = fopen (path, "rb"); } +#ifdef WINDOWSNT + if (!config && (home = getenv ("APPDATA"))) + { + char *path = alloca (32 + strlen (home) + strlen (server_file)); + sprintf (path, "%s/.emacs.d/server/%s", home, server_file); + config = fopen (path, "rb"); + } +#endif } if (! config)