2 files changed, 7 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 1c740904eb3..e57b1af1b8b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * s/ms-w32.h: Discourage from defining HAVE_GETCWD.
+
 2012-03-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.c (safe_run_hooks_error): Don't unquote strings.
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 5eed3a177dc..e89ecb05931 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -159,6 +159,9 @@ struct sigaction {
 #undef  HAVE_UTIMES
 #undef  HAVE_SETRLIMIT
 #undef  HAVE_SETPGID
+/* If you think about defining HAVE_GETCWD, don't: the alternative
+   getwd is redefined on w32.c, and does not really return the current
+   directory, to get the desired results elsewhere in Emacs */
 #undef  HAVE_GETCWD
 #define HAVE_SHUTDOWN 1