mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 16:51:06 -07:00
Code Issues Projects Releases Wiki Activity

(get_server_config) [WINDOWSNT]: Search the server file on APPDATA

Browse source 
if it doesn't exist on HOME, even if HOME is defined.
This commit is contained in:
Juanma Barranquero 2006-11-07 11:23:12 +00:00
parent 1d1c19ca25
commit 88b46d8431
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib-src/ChangeLog
View file

@ -1,5 +1,8 @@
2006-11-07 Juanma Barranquero <lekktu@gmail.com>
* emacsclient.c (get_server_config) [WINDOWSNT]: Look for the server
file on APPDATA if it doesn't exist on HOME, even if HOME is defined.
* 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.

13
lib-src/emacsclient.c
View file

@ -449,16 +449,21 @@ get_server_config (server, authentication)
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)