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

diff --git a/src/ChangeLog b/src/ChangeLog
index 55433577cee8677735922aa014379f2e433b35fc..61e7c3d8c232d111c96c963e8f9cf51992cd234a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/src/emacs.c b/src/emacs.c
index 223d125db32b80245f40bb254ec0bf8221bfe9e3..8d458c612ccc1d16500353273e1985df704e9a2c 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -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.  */