Commit 8671676c authored by Andreas Schwab's avatar Andreas Schwab

* emacs.c (decode_env_path): Only use defaulted if WINDOWSNT.

parent 663e2b3f
2012-08-05 Andreas Schwab <schwab@linux-m68k.org>
* emacs.c (decode_env_path): Only use defaulted if WINDOWSNT.
2012-08-05 Dmitry Antipov <dmantipov@yandex.ru>
Generalize common compile-time constants.
......
......@@ -2242,8 +2242,8 @@ decode_env_path (const char *evarname, const char *defalt)
{
const char *path, *p;
Lisp_Object lpath, element, tem;
int defaulted = 0;
#ifdef WINDOWSNT
int defaulted = 0;
const char *emacs_dir = egetenv ("emacs_dir");
static const char *emacs_dir_env = "%emacs_dir%/";
const size_t emacs_dir_len = strlen (emacs_dir_env);
......@@ -2259,7 +2259,9 @@ decode_env_path (const char *evarname, const char *defalt)
if (!path)
{
path = defalt;
#ifdef WINDOWSNT
defaulted = 1;
#endif
}
#ifdef DOS_NT
/* Ensure values from the environment use the proper directory separator. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment